Merge lp:~maxb/launchpad/debuild--no-conf into lp:launchpad

Proposed by Max Bowsher
Status: Merged
Merged at revision: not available
Proposed branch: lp:~maxb/launchpad/debuild--no-conf
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~maxb/launchpad/debuild--no-conf
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+11680@code.launchpad.net

Commit message

Run debuild with --no-conf so that it ignores local config files which may change its behaviour in unexpected ways.

To post a comment you must log in.
Revision history for this message
Max Bowsher (maxb) wrote :

== Summary ==
As per recent discussions, the testsuite is vulnerable to upset by environmental tweaks that a particular user has made. This closes one of those holes, by running debuild with --no-conf so that it ignores user config files.

== Tests / Demo and Q/A ==
For example:
bin/test -vvv -t testUploadResultingInNoBuilds

Creating the file ~/.devscripts containing the line:
DEBUILD_DPKG_BUILDPACKAGE_OPTS="-us -uc"

will break that test without this fix

== lint ==
clean

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Looks fine, I'll test and land it -- assuming my new ec2test script and images work :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/testing/fakepackager.py'
2--- lib/canonical/launchpad/testing/fakepackager.py 2009-06-25 05:30:52 +0000
3+++ lib/canonical/launchpad/testing/fakepackager.py 2009-09-14 04:07:18 +0000
4@@ -354,7 +354,7 @@
5 'Selected upstream directory does not exist: %s' % (
6 os.path.basename(self.upstream_directory)))
7
8- debuild_options = ['-S']
9+ debuild_options = ['--no-conf', '-S']
10
11 if not signed:
12 debuild_options.extend(['-uc', '-us'])