Launchpad itself

Merge lp:~mwhudson/launchpad/fix-public-image-building into lp:launchpad

  1. fix-public-image-building
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Jonathan Lange
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/fix-public-image-building
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
lib/devscripts/ec2test/builtins.py (+1/-1)
To merge this branch: bzr merge lp:~mwhudson/launchpad/fix-public-image-building
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+14970@code.launchpad.net

Commit message

don't try to run /var/launchpad/test/utilities/update-sourcecode /var/launchpad/sourcecode--public when building a public ec2 image for ec2 test

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

This typo has been in the code for too long.

Revision history for this message
Jonathan Lange (jml) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/devscripts/ec2test/builtins.py'
2--- lib/devscripts/ec2test/builtins.py 2009-10-16 11:07:37 +0000
3+++ lib/devscripts/ec2test/builtins.py 2009-11-17 23:00:30 +0000
4@@ -557,7 +557,7 @@
5 'bzr pull -d /var/launchpad/download-cache '
6 'lp:lp-source-dependencies')
7 if public:
8- update_sourcecode_options = '--public-only'
9+ update_sourcecode_options = ' --public-only'
10 else:
11 update_sourcecode_options = ''
12 user_connection.run_with_ssh_agent(