Ubuntu One Client

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

  1. fix-Volume_init
  2. Merge into trunk
Proposed by Guillermo Gonzalez
Status: Merged
Approved by: Facundo Batista
Approved revision: 1171
Merged at revision: 1171
Proposed branch: lp:~verterok/ubuntuone-client/fix-Volume_init
Merge into: lp:ubuntuone-client
Diff against target: 13 lines (+1/-2)
1 file modified
ubuntuone/syncdaemon/volume_manager.py (+1/-2)
To merge this branch: bzr merge lp:~verterok/ubuntuone-client/fix-Volume_init
Reviewer Review Type Date Requested Status
Facundo Batista (community) Approve
Curtis Caravone (community) Approve
Review via email: mp+86418@code.launchpad.net

Commit message

Remove local_rescanning from the Volume.__init__ as isn't needed.

Description of the change

Remove local_rescanning from the Volume.__init__ as isn't needed.

To post a comment you must log in.
Revision history for this message
Curtis Caravone (caravone) :
review: Approve
Revision history for this message
Facundo Batista (facundo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
2--- ubuntuone/syncdaemon/volume_manager.py 2011-12-12 19:32:25 +0000
3+++ ubuntuone/syncdaemon/volume_manager.py 2011-12-20 15:42:46 +0000
4@@ -124,8 +124,7 @@
5 # False no matter what is passed to the constructor
6 local_rescanning = False
7
8- def __init__(self, volume_id, node_id, generation=None, subscribed=False,
9- local_rescanning=None):
10+ def __init__(self, volume_id, node_id, generation=None, subscribed=False):
11 """Create the volume."""
12 # id and node_id should be str or None
13 assert isinstance(volume_id, basestring) or volume_id is None

Subscribers

People subscribed via source and target branches