Accepting request 1204306 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1204306 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysuser-tools?expand=0&rev=31
- Remove check for .buildenv to see failures in OBS
2024-09-29 16:08:58 +00:00 · 2024-09-28 06:58:41 +00:00
5 changed files with 9 additions and 4 deletions
--- a/disable-systemd-sysusers.patch
+++ b/disable-systemd-sysusers.patch
@ -7,7 +7,7 @@
 -if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then
 -
 -	if [ -n "$1" ] && [ "$1" != "%3" ]; then
-		REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1" ||:
+-		REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1"
 -	fi
 -	# Use systemd-sysusers and let it read the input directly from stdin
 -	run /usr/bin/systemd-sysusers $REPLACE_ARG -
--- a/sysuser-tools.changes
+++ b/sysuser-tools.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug  7 13:42:07 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
+
+- Remove check for .buildenv to see failures in OBS
+
 -------------------------------------------------------------------
 Wed Aug  7 10:04:38 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>

--- a/sysuser-tools.spec
+++ b/sysuser-tools.spec
@ -82,7 +82,7 @@ m   me  nogroup
 EOF

 cat <<EOFF > expected-account-pre
-/usr/sbin/sysusers2shadow me.conf <<"EOF" || [ -f /.buildenv ]
+/usr/sbin/sysusers2shadow me.conf <<"EOF"
 u   me   -     "myself" /dev/null
 m   me  nogroup
 g   asdf
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 #!/bin/bash
 # pass systemd sysusers config paths as argument to this script.

-echo "/usr/sbin/sysusers2shadow $2 <<\"EOF\" || [ -f /.buildenv ]"
+echo "/usr/sbin/sysusers2shadow $2 <<\"EOF\""
 (while read -r line; do if [[ $line =~ ^\s*[ugmr] ]]; then echo "$line"; fi; done) < "$1"
 echo 'EOF'
--- a/sysusers2shadow.sh
+++ b/sysusers2shadow.sh
@ -10,7 +10,7 @@ run() {
 if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then

 	if [ -n "$1" ] && [ "$1" != "%3" ]; then
-		REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1" ||:
+		REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1"
 	fi
 	# Use systemd-sysusers and let it read the input directly from stdin
 	run /usr/bin/systemd-sysusers $REPLACE_ARG -