Colin Watson has proposed merging ~cjwatson/launchpad-buildd:rename-slave-config-env into launchpad-buildd:master.
Commit message: Rename BUILDD_SLAVE_CONFIG environment variable to BUILDD_CONFIG Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/411220 -- Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:rename-slave-config-env into launchpad-buildd:master.
diff --git a/debian/changelog b/debian/changelog index 5c972b4..25ba1b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +launchpad-buildd (204) UNRELEASED; urgency=medium + + * Rename BUILDD_SLAVE_CONFIG environment variable to BUILDD_CONFIG. + + -- Colin Watson <[email protected]> Wed, 03 Nov 2021 11:20:32 +0000 + launchpad-buildd (203) bionic; urgency=medium * Remove some more "slave" terminology from tests. diff --git a/debian/launchpad-buildd.init b/debian/launchpad-buildd.init index 4952893..b92d911 100755 --- a/debian/launchpad-buildd.init +++ b/debian/launchpad-buildd.init @@ -79,7 +79,7 @@ d_start() { # Useful for certain kinds of image builds. modprobe nbd || true - su - buildd -c "BUILDD_SLAVE_CONFIG=$CONFROOT/$CONF twistd3 --no_save --pidfile $PIDFILE --python $TACFILE --logfile $LOGFILE --umask 022" + su - buildd -c "BUILDD_CONFIG=$CONFROOT/$CONF twistd3 --no_save --pidfile $PIDFILE --python $TACFILE --logfile $LOGFILE --umask 022" } # diff --git a/lpbuildd/buildd-slave.tac b/lpbuildd/buildd-slave.tac index 7c1947e..dec2156 100644 --- a/lpbuildd/buildd-slave.tac +++ b/lpbuildd/buildd-slave.tac @@ -35,7 +35,7 @@ from lpbuildd.translationtemplates import TranslationTemplatesBuildManager options = ServerOptions() options.parseOptions() -conffile = os.environ.get('BUILDD_SLAVE_CONFIG', 'buildd-slave-example.conf') +conffile = os.environ.get('BUILDD_CONFIG', 'buildd-slave-example.conf') conf = SafeConfigParser() conf.read(conffile) diff --git a/lpbuildd/tests/harness.py b/lpbuildd/tests/harness.py index bd85753..f064d53 100644 --- a/lpbuildd/tests/harness.py +++ b/lpbuildd/tests/harness.py @@ -114,8 +114,7 @@ class BuilddTestSetup(TacTestFixture): filecache = os.path.join(self.root, 'filecache') os.mkdir(filecache) self.useFixture(EnvironmentVariable('HOME', self.root)) - self.useFixture( - EnvironmentVariable('BUILDD_SLAVE_CONFIG', test_conffile)) + self.useFixture(EnvironmentVariable('BUILDD_CONFIG', test_conffile)) # XXX cprov 2005-05-30: # When we are about running it seriously we need : # * install sbuild package
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
