From 2f5a50dce3fe6b0b96723fd98278cd4207406481367d78bf204dd614de1d6e9f Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 12 Oct 2017 11:27:01 +0000
Subject: [PATCH] Accepting request 532757 from home:dimstar:Factory

I think this should finally cater to all cases, and still allow us to have proper error handling on actual systems

OBS-URL: https://build.opensuse.org/request/show/532757
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysuser-tools?expand=0&rev=13
---
 sysuser-tools.changes | 9 +++++++++
 sysusers-generate-pre | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sysuser-tools.changes b/sysuser-tools.changes
index a77dcb5..974194d 100644
--- a/sysuser-tools.changes
+++ b/sysuser-tools.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Oct  9 13:51:42 UTC 2017 - dimstar@opensuse.org
+
+- Furhter enhance sysusers-generate-pre: inside the build
+  environment, it can be acceptable to be failing to create the
+  users (e.g when building sysuser-tools or system-user-root, since
+  those two packages have to be speificallty excluded). Always
+  return with error code 0 if /.buildenv exists.
+
 -------------------------------------------------------------------
 Wed Sep 27 11:06:52 UTC 2017 - dimstar@opensuse.org
 
diff --git a/sysusers-generate-pre b/sysusers-generate-pre
index dfbd7d7..c79114a 100644
--- a/sysusers-generate-pre
+++ b/sysusers-generate-pre
@@ -19,6 +19,8 @@ lines=`wc -l < "$tmpfile"`
 
 echo '#!/bin/bash'
 echo "tail -n $lines \$0 | /usr/sbin/sysusers2shadow"
-echo 'exit $?'
+echo 'RET=$?'
+echo 'test -f /.buildenv && exit 0'
+echo 'exit $RET'
 echo '######## data below ########'
 cat "$tmpfile"