Merge lp:~mandel/ubuntuone-client/fix-logging into lp:ubuntuone-client

[Manuel de la Peña]

- Fix logging by escaping % (LP: #1043183).

- Fix logging by escaping % (LP: #1043183).

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone/syncdaemon/logger.py'
--- ubuntuone/syncdaemon/logger.py	2012-06-21 18:58:50 +0000
+++ ubuntuone/syncdaemon/logger.py	2012-08-29 10:53:51 +0000
@@ -75,6 +75,7 @@
 
         desc = "%-28s share:%-40r node:%-40r %s(%s) " % (_method, _share,
                                                          _uid, _method, args)
+        desc = desc.replace('%', '%%')
         self.zipped_desc = zlib.compress(desc, 9)
         self.logger = _logger
 

=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2012-06-13 21:31:24 +0000
+++ ubuntuone/syncdaemon/sync.py	2012-08-29 10:53:51 +0000
@@ -271,7 +271,7 @@
                 path = self.key.safe_get('path')
             extra = dict(message=message,
                          mdid=self.key.safe_get("mdid"),
-                         path=path,
+                         path=path.replace('%', '%%'),   # escape %
                          share_id=self.key.safe_get("share_id") or 'root',
                          node_id=self.key.safe_get("node_id"),
                          hasmd=self.key.has_metadata(),