Merge lp:~facundo/u1sync/fix-log-folder into lp:u1sync

[Facundo Batista]

Took the log folder from the correct place.

Took the log folder from the correct place.

This is just a name update, after changes in ubuntuone.logger.

[Alejandro J. Cura (alecu)]

code looks good, tests pass.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~facundo/u1sync/fix-log-folder into lp:u1sync failed. Below is the output from the failed tests.

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 269, in <module>
    main()
  File "/usr/bin/u1trial", line 265, in main
    TestRunner(force_gc=options.force_gc).run(testpath, options)
  File "/usr/bin/u1trial", line 182, in run
    options.ignored_modules, options.ignored_paths)
  File "/usr/bin/u1trial", line 161, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 89, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/var/cache/tarmac/u1sync/trunk/u1sync/tests/test_client.py", line 23, in <module>
    from u1sync import client
  File "/var/cache/tarmac/u1sync/trunk/u1sync/client.py", line 35, in <module>
    from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
  File "/usr/lib/pymodules/python2.6/ubuntuone-client/ubuntuone/platform/__init__.py", line 10, in <module>
    from ubuntuone.platform import linux
  File "/usr/lib/pymodules/python2.6/ubuntuone-client/ubuntuone/platform/linux/__init__.py", line 63, in <module>
    from ubuntuone.platform.linux.credentials import CredentialsManagementTool
  File "/usr/lib/pymodules/python2.6/ubuntuone-client/ubuntuone/platform/linux/credentials.py", line 24, in <module>
    from ubuntu_sso.credentials import (
  File "/usr/lib/pymodules/python2.6/ubuntu_sso/credentials.py", line 50, in <module>
    from ubuntu_sso.keyring import Keyring
ImportError: No module named keyring

=== modified file 'u1sync/client.py'
--- u1sync/client.py	2011-02-09 14:58:35 +0000
+++ u1sync/client.py	2011-09-01 12:57:25 +0000
@@ -32,7 +32,7 @@
 
 from twisted.internet import reactor, defer
 from twisted.internet.defer import inlineCallbacks, returnValue
-from ubuntuone.logger import LOGFOLDER
+from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
 from ubuntuone.storageprotocol.content_hash import crc32
 from ubuntuone.storageprotocol.context import get_ssl_context
 from u1sync.genericmerge import MergeNode
@@ -62,7 +62,7 @@
     """Converts a share UUID to a form the protocol likes."""
     return str(share_uuid) if share_uuid is not None else request.ROOT
 
-LOGFILENAME = os.path.join(LOGFOLDER, 'u1sync.log')
+LOGFILENAME = os.path.join(ubuntuone_log_dir, 'u1sync.log')
 u1_logger = logging.getLogger("u1sync.timing.log")
 handler = RotatingFileHandler(LOGFILENAME)
 u1_logger.addHandler(handler)