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

[Guillermo Gonzalez]

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

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

[John O'Brien (jdobrien)]

Looks good.

review: Approve

=== modified file 'bin/u1sdtool'
--- bin/u1sdtool	2010-08-16 14:19:11 +0000
+++ bin/u1sdtool	2010-09-07 19:37:42 +0000
@@ -125,7 +125,7 @@
     elif options.unsubscribe_folder:
         d = sync_daemon_tool.unsubscribe_folder(options.unsubscribe_folder)
         d.addErrback(lambda r: show_error(r, out))
-    elif options.rescan_from_scratch:
+    elif options.rescan_from_scratch is not None:
         d = sync_daemon_tool.rescan_from_scratch(options.rescan_from_scratch)
         d.addErrback(lambda r: show_error(r, out))
     elif options.publish_file: