Merge lp:~zyga/lava-dashboard-tool/fix-pull into lp:lava-dashboard-tool/linaro-11.05

Proposed by Zygmunt Krynicki
Status: Merged
Merged at revision: 134
Proposed branch: lp:~zyga/lava-dashboard-tool/fix-pull
Merge into: lp:lava-dashboard-tool/linaro-11.05
Diff against target: 25 lines (+5/-3)
1 file modified
launch_control_tool/commands/dashboard.py (+5/-3)
To merge this branch: bzr merge lp:~zyga/lava-dashboard-tool/fix-pull
Reviewer Review Type Date Requested Status
Zygmunt Krynicki Pending
Review via email: mp+59445@code.launchpad.net

Description of the change

Fix a bug preventing pull from working in certain cases.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launch_control_tool/commands/dashboard.py'
2--- launch_control_tool/commands/dashboard.py 2011-04-28 12:27:14 +0000
3+++ launch_control_tool/commands/dashboard.py 2011-04-29 00:33:23 +0000
4@@ -748,7 +748,11 @@
5 local = self.server.streams()
6 missing_pathnames = set([stream["pathname"] for stream in remote]) - set([stream["pathname"] for stream in local])
7 for stream in remote:
8- local_bundles = [bundle for bundle in self.server.bundles(stream["pathname"])]
9+ if stream["pathname"] in missing_pathnames:
10+ self.server.make_stream(stream["pathname"], stream["name"])
11+ local_bundles = []
12+ else:
13+ local_bundles = [bundle for bundle in self.server.bundles(stream["pathname"])]
14 remote_bundles = [bundle for bundle in self.remote_server.bundles(stream["pathname"])]
15 missing_bundles = set((bundle["content_sha1"] for bundle in remote_bundles)) - set((bundle["content_sha1"] for bundle in local_bundles))
16 try:
17@@ -762,8 +766,6 @@
18 print "Stream %s needs update" % (stream["pathname"],)
19 else:
20 print "Stream %s is up to date" % (stream["pathname"],)
21- if stream["pathname"] in missing_pathnames:
22- self.server.make_stream(stream["pathname"], stream["name"])
23 for content_sha1 in missing_bundles:
24 print "Getting %s" % (content_sha1,),
25 sys.stdout.flush()

Subscribers

People subscribed via source and target branches

to all changes: