From 46fe4773a2d063ad9bf74ff3aef258da102865d8 Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Thu, 28 Feb 2019 16:23:25 +0100
Subject: Do not store build user name

---
 SConstruct      | 6 +++++-
 src/CHANGES.txt | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 760b1c6..b94a3e3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -81,6 +81,8 @@ if not developer:
         developer = os.environ.get(variable)
         if developer:
             break
+    if os.environ.get('SOURCE_DATE_EPOCH'):
+        developer = '_reproducible'
 
 build_system = ARGUMENTS.get('BUILD_SYSTEM')
 if not build_system:
@@ -181,7 +183,9 @@ command_line_variables = [
 
     ("DEVELOPER=",      "The developer who created the packages.  " +
                         "The default is the first set environment " +
-                        "variable from the list $USERNAME, $LOGNAME, $USER."),
+                        "variable from the list $USERNAME, $LOGNAME, $USER." +
+                        "If the SOURCE_DATE_EPOCH env var is set, " +
+                        "'_reproducible' is the default."),
 
     ("REVISION=",       "The revision number of the source being built.  " +
                         "The default is the git hash returned " +
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 39b11f2..b9052bb 100755
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -27,7 +27,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix syntax on is/is not cluases: should not use with a literal
 
   From Bernhard M. Wiedemann:
-    - Do not store build host name if reproducible builds are wanted
+    - Do not store build host+user name if reproducible builds are wanted
 
 
 RELEASE 3.0.4 - Mon, 20 Jan 2019 22:49:27 +0000
-- 
cgit v0.12