← Back to branch summary

~diegosarmentero/ubuntuone-client/darwin2-fsevents

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/config.py

  • Committer: Diego Sarmentero
  • Date: 2012-06-22 14:07:26 UTC
  • mfrom: (1261.2.3 ubuntuone-client)
  • Revision ID: diego.sarmentero@canonical.com-20120622140726-3m0w05qwslv24x8d
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/config.py
36
36
 
37
37
from ConfigParser import NoOptionError, NoSectionError
38
38
from optparse import OptionParser
39
 
from ubuntu_sso.xdg_base_directory import (
 
39
from dirspec.basedir import (
40
40
    load_config_paths,
41
 
    native_path,
42
41
    save_config_path,
43
42
    xdg_data_home,
44
43
    xdg_cache_home,
83
82
logger = logging.getLogger('ubuntuone.SyncDaemon.config')
84
83
 
85
84
# get (and possibly create if don't exists) the user config file
86
 
_user_config_path = os.path.join(native_path(save_config_path('ubuntuone')),
 
85
_user_config_path = os.path.join(save_config_path('ubuntuone'),
87
86
                                 CONFIG_FILE)
88
87
 
89
88
# module private config instance.
166
165
    """
167
166
    config_files = []
168
167
    for xdg_config_dir in load_config_paths('ubuntuone'):
169
 
        xdg_config_dir = native_path(xdg_config_dir)
170
168
        config_file = os.path.join(xdg_config_dir, CONFIG_FILE)
171
169
        if os.path.exists(config_file):
172
170
            config_files.append(config_file)