← Back to branch summary

~alecu/ubuntuone-client/use-standard-reactor

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/volume_manager.py

  • Committer: Alejandro J. Cura
  • Date: 2011-06-30 19:20:39 UTC
  • mfrom: (1031.1.4 ubuntuone-client)
  • Revision ID: alecu@canonical.com-20110630192039-i5haubbwvnpw08if
merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/volume_manager.py
43
43
from ubuntuone.platform import (
44
44
    allow_writes,
45
45
    create_shares_link,
46
 
    normpath,
 
46
    expanduser,
 
47
    get_path_list,
47
48
    get_udf_path,
48
49
    get_share_path,
49
50
    get_udf_path_name,
50
 
    set_dir_readonly,
51
 
    set_dir_readwrite,
 
51
    is_link,
 
52
    listdir,
 
53
    make_dir,
 
54
    normpath,
52
55
    path_exists,
53
 
    make_dir,
54
 
    expanduser,
55
 
    get_path_list,
56
56
    read_link,
57
57
    rename,
58
 
    is_link,
 
58
    set_dir_readonly,
 
59
    set_dir_readwrite
59
60
)
60
61
from ubuntuone.platform import abspath as os_abspath
61
62
 
1638
1639
                os.makedirs(os.path.dirname(self._shares_dir))
1639
1640
            self.log.debug('moving shares dir from: %r to %r',
1640
1641
                           old_share_dir, self._shares_dir)
1641
 
            for path in os.listdir(old_share_dir):
 
1642
            for path in listdir(old_share_dir):
1642
1643
                src = os.path.join(old_share_dir, path)
1643
1644
                dst = os.path.join(self._shares_dir, path)
1644
1645
                move(src, dst)
1668
1669
            # make My Files rw
1669
1670
            os.chmod(old_root_dir, 0775)
1670
1671
            path_join = os.path.join
1671
 
            for relpath in os.listdir(old_root_dir):
 
1672
            for relpath in listdir(old_root_dir):
1672
1673
                old_path = path_join(old_root_dir, relpath)
1673
1674
                new_path = path_join(self._root_dir, relpath)
1674
1675
                if os.path.exists(new_path):