← Back to team overview

duplicity-team team mailing list archive

[Merge] lp:~mterry/duplicity/argv-encode into lp:duplicity

 

Michael Terry has proposed merging lp:~mterry/duplicity/argv-encode into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~mterry/duplicity/argv-encode/+merge/200580

This is a follow on to recent encoding changes.  When printing the arguments we've received, we need to use the system filename encoding to print the args in unicode.  Otherwise, doing something like:

$ duplicity /tmp/Ё file:///tmp/backup

will result in a UnicodeDecodeError exception.
-- 
https://code.launchpad.net/~mterry/duplicity/argv-encode/+merge/200580
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/argv-encode into lp:duplicity.
=== modified file 'bin/duplicity'
--- bin/duplicity	2013-12-27 06:39:00 +0000
+++ bin/duplicity	2014-01-06 20:18:14 +0000
@@ -1220,7 +1220,7 @@
     """
     log.Log(u'=' * 80, verbosity)
     log.Log(u"duplicity $version ($reldate)", verbosity)
-    log.Log(u"Args: %s" % (' '.join(sys.argv),), verbosity)
+    log.Log(u"Args: %s" % util.ufn(' '.join(sys.argv)), verbosity)
     log.Log(u' '.join(platform.uname()), verbosity)
     log.Log(u"%s %s" % (sys.executable or sys.platform, sys.version), verbosity)
     log.Log(u'=' * 80, verbosity)


Follow ups