linaro-license-protection

Merge lp:~danilo/linaro-license-protection/more-deployment-fixes into lp:~linaro-automation/linaro-license-protection/trunk

  1. more-deployment-fixes
  2. Merge into trunk
Proposed by Данило Шеган
Status: Merged
Approved by: Stevan Radaković
Approved revision: 103
Merged at revision: 103
Proposed branch: lp:~danilo/linaro-license-protection/more-deployment-fixes
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
scripts/update-deployment.py (+2/-2)
To merge this branch: bzr merge lp:~danilo/linaro-license-protection/more-deployment-fixes
Reviewer Review Type Date Requested Status
Stevan Radaković Approve
Review via email: mp+119919@code.launchpad.net

Description of the change

Due to the directory layout having changed on the staging system,
we have to refresh the branch as well before we update the working tree.

refresh_branch calls update_tree anyway, so removing that call.

To post a comment you must log in.
Revision history for this message
Stevan Radaković (stevanr) wrote :

Looks great.
Approve +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/update-deployment.py'
2--- scripts/update-deployment.py 2012-08-16 12:12:39 +0000
3+++ scripts/update-deployment.py 2012-08-16 13:11:20 +0000
4@@ -91,8 +91,8 @@
5
6 Afterwards, it runs "syncdb" and "collectstatic" steps.
7 """
8- update_tree(os.path.join(installation_root, branch_name))
9- update_tree(os.path.join(installation_root, "configs"))
10+ refresh_branch(os.path.join(installation_root, branch_name))
11+ refresh_branch(os.path.join(installation_root, "configs"))
12 os.environ["PYTHONPATH"] = (
13 ":".join(
14 [installation_root,

Subscribers

People subscribed via source and target branches