[reprotest] 04/04: main: move comments to the right place

Ximin Luo infinity0 at debian.org
Fri Oct 13 14:33:39 UTC 2017


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

infinity0 pushed a commit to branch master
in repository reprotest.

commit 5904725dd559549a98010de1acadf31be8b441ec
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Oct 13 16:32:23 2017 +0200

    main: move comments to the right place
---
 reprotest/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index ba3a225..0bdf055 100644
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -152,6 +152,8 @@ class BuildContext(collections.namedtuple('_BuildContext',
         return os.path.join(self.local_dist_root, self.build_name)
 
     def make_build_commands(self, script, env):
+        # this dance is necessary because the cwd can't be cd'd into during the
+        # setup phase under some variations like user_group
         _ = self.plan_variations(Build.from_command(
             build_command =
                 'cd "$REPROTEST_BUILD_PATH"; unset REPROTEST_BUILD_PATH; ' +
@@ -189,16 +191,14 @@ class BuildContext(collections.namedtuple('_BuildContext',
         testbed.check_exec2(
             ['sh', '-ec', 'cd "%s" && rm -rf %s && %s' %
             (self.testbed_src, artifact_pattern, testbed_build_pre or "true")])
-        # this dance is necessary because the cwd can't be cd'd into during the
-        # setup phase under some variations like user_group
-        new_script = build.to_script(no_clean_on_error)
+        build_script = build.to_script(no_clean_on_error)
         logging.info("executing build in %s", build.tree)
         logging.debug("#### REPROTEST BUILD ENVVARS ###################################################\n" +
             "\n".join(environ.env_diff(old_env, build.env)))
         logging.debug("#### BEGIN REPROTEST BUILD SCRIPT ##############################################\n" +
-            new_script)
+            build_script)
         logging.debug("#### END REPROTEST BUILD SCRIPT ################################################")
-        testbed.check_exec2(['sh', '-ec', new_script],
+        testbed.check_exec2(['sh', '-ec', build_script],
             xenv=['-i'] + ['%s=%s' % (k, v) for k, v in build.env.items()],
             kind='build')
         logging.info("build successful, copying artifacts")

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



More information about the Reproducible-commits mailing list