Drizzle Automation

Merge lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/fix-lcov2 into lp://qastaging/drizzle-automation

  1. fix-lcov2
  2. Merge into trunk
Proposed by Lee Bieber
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/fix-lcov2
Merge into: lp://qastaging/drizzle-automation
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/fix-lcov2
Reviewer Review Type Date Requested Status
Jay Pipes Approve
Review via email: mp+8479@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

missed one location where we need to add --overwrite when pulling code from the repository

Revision history for this message
Jay Pipes (jaypipes) wrote :

Hmm, I thought this was already merged...approved. Will be merged into trunk shortly. :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'drizzle/automation/lib/sandbox.py'
--- drizzle/automation/lib/sandbox.py 2009-06-25 23:29:35 +0000
+++ drizzle/automation/lib/sandbox.py 2009-07-09 17:41:56 +0000
@@ -152,7 +152,7 @@
152 # Check to see if it's a bzr branch.152 # Check to see if it's a bzr branch.
153 os.chdir(self.revisional_branch_dir)153 os.chdir(self.revisional_branch_dir)
154154
155 (retcode, output)= commands.getstatusoutput("bzr pull -r%s" % self.revno)155 (retcode, output)= commands.getstatusoutput("bzr pull -r%s --overwrite" % self.revno)
156 if retcode != 0:156 if retcode != 0:
157 logging.error("Sandbox directory \"%s\" exists, but is not a BZR branch! Exiting." % (self.revisional_branch_dir))157 logging.error("Sandbox directory \"%s\" exists, but is not a BZR branch! Exiting." % (self.revisional_branch_dir))
158 sys.exit(1)158 sys.exit(1)

Subscribers

People subscribed via source and target branches

to all changes: