Ubuntu One Client

Merge lp:~verterok/ubuntuone-client/fix-619958 into lp:ubuntuone-client

  1. fix-619958
  2. Merge into trunk
Proposed by Guillermo Gonzalez
Status: Merged
Approved by: John O'Brien
Approved revision: 681
Merged at revision: 681
Proposed branch: lp:~verterok/ubuntuone-client/fix-619958
Merge into: lp:ubuntuone-client
Diff against target: 12 lines (+1/-1)
1 file modified
bin/u1sdtool (+1/-1)
To merge this branch: bzr merge lp:~verterok/ubuntuone-client/fix-619958
Reviewer Review Type Date Requested Status
John O'Brien (community) Approve
Review via email: mp+34792@code.launchpad.net

Commit message

Fix u1sdtool --rescan_from_scratch args parsing to support VOLUME_ID=""

Description of the change

Fix u1sdtool --rescan_from_scratch args parsing to support VOLUME_ID="" for the root volume case.

To post a comment you must log in.
Revision history for this message
John O'Brien (jdobrien) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/u1sdtool'
2--- bin/u1sdtool 2010-08-16 14:19:11 +0000
3+++ bin/u1sdtool 2010-09-07 19:37:42 +0000
4@@ -125,7 +125,7 @@
5 elif options.unsubscribe_folder:
6 d = sync_daemon_tool.unsubscribe_folder(options.unsubscribe_folder)
7 d.addErrback(lambda r: show_error(r, out))
8- elif options.rescan_from_scratch:
9+ elif options.rescan_from_scratch is not None:
10 d = sync_daemon_tool.rescan_from_scratch(options.rescan_from_scratch)
11 d.addErrback(lambda r: show_error(r, out))
12 elif options.publish_file:

Subscribers

People subscribed via source and target branches