Duplicity

Merge lp:~mterry/duplicity/missing-unicode-escape into lp:~duplicity-team/duplicity/0.7-series

  1. missing-unicode-escape
  2. Merge into 0.7-series
Proposed by Michael Terry
Status: Merged
Merged at revision: 1015
Proposed branch: lp:~mterry/duplicity/missing-unicode-escape
Merge into: lp:~duplicity-team/duplicity/0.7-series
Diff against target: 12 lines (+1/-1)
1 file modified
bin/duplicity (+1/-1)
To merge this branch: bzr merge lp:~mterry/duplicity/missing-unicode-escape
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+240780@code.launchpad.net

Description of the change

Convert restore_dir to unicode before printing.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/duplicity'
--- bin/duplicity 2014-10-27 02:27:36 +0000
+++ bin/duplicity 2014-11-05 21:20:49 +0000
@@ -691,7 +691,7 @@
691 restore_get_patched_rop_iter(col_stats)):691 restore_get_patched_rop_iter(col_stats)):
692 if globals.restore_dir:692 if globals.restore_dir:
693 log.FatalError(_("%s not found in archive, no files restored.")693 log.FatalError(_("%s not found in archive, no files restored.")
694 % (globals.restore_dir,),694 % (util.ufn(globals.restore_dir)),
695 log.ErrorCode.restore_dir_not_found)695 log.ErrorCode.restore_dir_not_found)
696 else:696 else:
697 log.FatalError(_("No files found in archive - nothing restored."),697 log.FatalError(_("No files found in archive - nothing restored."),

Subscribers

People subscribed via source and target branches