Merge lp://qastaging/~dooferlad/linaro-license-protection/just_use_bzr into lp://qastaging/~linaro-automation/linaro-license-protection/trunk

Proposed by James Tunnicliffe
Status: Merged
Approved by: Данило Шеган
Approved revision: 119
Merged at revision: 117
Proposed branch: lp://qastaging/~dooferlad/linaro-license-protection/just_use_bzr
Merge into: lp://qastaging/~linaro-automation/linaro-license-protection/trunk
Diff against target: 40 lines (+2/-21)
1 file modified
scripts/update-deployment.py (+2/-21)
To merge this branch: bzr merge lp://qastaging/~dooferlad/linaro-license-protection/just_use_bzr
Reviewer Review Type Date Requested Status
Данило Шеган (community) Approve
Review via email: mp+121068@code.qastaging.launchpad.net

Description of the change

Removed use of bzrlib - just using bzr commands.

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

Too fast:

$ scripts/update-deployment.py -vvv settings_staging_snapshots
2012-08-23 20:35:24,791 DEBUG: stdout:
Using saved parent location: http://bazaar.launchpad.net/~linaro-infrastructure/linaro-license-protection/trunk/
 Now on revision 116.
2012-08-23 20:35:24,792 DEBUG: stderr:
 M scripts/linaroscript.py
  M scripts/update-deployment.py
 All changes applied successfully.
Traceback (most recent call last):
  File "scripts/update-deployment.py", line 137, in <module>
    script.run()
  File "/home/danilo/linaro/linaro-license-protection/just_use_bzr/scripts/linaroscript.py", line 45, in run
    self.work()
  File "scripts/update-deployment.py", line 124, in work
    self.refresh_branch(code_root)
  File "scripts/update-deployment.py", line 66, in refresh_branch
    self.run_subcommand(["bzr", "up"], working_tree_dir)
NameError: global name 'working_tree_dir' is not defined

Should be s/working_tree_dir/branch_dir/.

Approved with that caveat.

review: Approve
119. By James Tunnicliffe

Fix broken name.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches