[reprotest] 02/02: Choose an existent HOME for the control build. (Closes: #860428)

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository reprotest.

commit 5f04b52771cd04947b8c36119d1c2a70054632f9
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Aug 17 21:19:06 2017 +0200

    Choose an existent HOME for the control build. (Closes: #860428)
---
 debian/changelog      | 5 ++---
 reprotest/__init__.py | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9fc4ec..79b4062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,15 +4,14 @@ reprotest (0.6.3) UNRELEASED; urgency=medium
   * Document when one should use --diffoscope-args=--exclude-directory-metadata
     and do this in our Debian package presets.
   * Bump diffoscope Recommends version to >= 84 to support this flag.
+  * Import autopkgtest 4.4, with minimal patches.
+  * Choose an existent HOME for the control build. (Closes: #860428)
 
   [ Mattia Rizzolo ]
   * Bump Standards-Version to 4.0.0.
     + Use https for the Format URI in debian/copyright.
   * Bump debhelper compat level to 10.
 
-  [ Ximin Luo ]
-  * Import autopkgtest 4.4, with minimal patches.
-
   [ Santiago Torres ]
   * Abstract parts of autopkgtest to support running on non-Debian systems.
   * Add a --host-distro flag to support that too.
diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index 45dd553..06fe272 100644
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -248,8 +248,10 @@ def fileordering(script, env, tree, *args):
 # # def fileordering(script, env, tree):
 #     return script, env, tree
 
+# Note: this has to go after anything that might modify 'tree' e.g. build_path
 def home(script, env, tree, *args):
-    control = add(env.control, 'HOME', '/nonexistent/first-build')
+    # choose an existent HOME, see Debian bug #860428
+    control = add(env.control, 'HOME', tree.control)
     experiment = add(env.experiment, 'HOME', '/nonexistent/second-build')
     return script, Pair(control, experiment), tree
 
@@ -314,7 +316,7 @@ def timezone(script, env, tree, *args):
     experiment = add(env.experiment, 'TZ', 'GMT-14')
     return script, Pair(control, experiment), tree
 
-def faketime(script, env, tree, source_root):
+def faketime(script, env, tree, source_root, *args):
     # Get the latest modification date of all the files in the source root.
     # This tries hard to avoid bad interactions with faketime and make(1) etc.
     # However if you're building this too soon after changing one of the source

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reprotest.git