← Back to branch summary

~diegosarmentero/ubuntuone-client/darwin2-fsevents

~diegosarmentero/ubuntuone-client/darwin2-fsevents

« back to all changes in this revision

Viewing changes to data/source_ubuntuone-client.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

files removed:
ubuntuone/platform/xdg_base_directory

ubuntuone/platform/xdg_base_directory/__init__.py

files renamed:
tests/platform/test_xdg_base_directory.py => tests/platform/test_logger.py

files modified:
bin/ubuntuone-syncdaemon

contrib/dump_metadata.py

contrib/testing/testcase.py

data/source_ubuntuone-client.py

data/syncdaemon.conf

tests/syncdaemon/test_config.py

tests/syncdaemon/test_main.py

ubuntuone/platform/__init__.py

ubuntuone/platform/credentials/__init__.py

ubuntuone/platform/logger/__init__.py

ubuntuone/proxy/logger.py

ubuntuone/status/logger.py

ubuntuone/syncdaemon/config.py

ubuntuone/syncdaemon/logger.py

ubuntuone/syncdaemon/main.py

Show diffs side-by-side

added added

removed removed

data/source_ubuntuone-client.py

33

33

import apport

34

34

from apport.hookutils import attach_file_if_exists

35

35

import os.path

36

from xdg.BaseDirectory import xdg_cache_home, xdg_config_home

36

from dirspec.basedir import xdg_cache_home, xdg_config_home

37

37

38

38

# Paths where things we might want live

39

39

u1_log_path = os.path.join(xdg_cache_home, "ubuntuone", "log")

Older »