From: Brian Warner <warner@allmydata.com>
Date: Fri, 13 Mar 2009 06:54:02 +0000 (-0700)
Subject: consolidate: tolerate unicode dirnames
X-Git-Tag: allmydata-tahoe-1.4.0~57
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/-?a=commitdiff_plain;h=06bf443e914706e0f87cad9b0ccdcfbca5ea80e6;p=tahoe-lafs%2Ftahoe-lafs.git

consolidate: tolerate unicode dirnames
---

diff --git a/src/allmydata/scripts/consolidate.py b/src/allmydata/scripts/consolidate.py
index 5dcec8a2..a98c1511 100644
--- a/src/allmydata/scripts/consolidate.py
+++ b/src/allmydata/scripts/consolidate.py
@@ -280,7 +280,7 @@ class Consolidator:
         old_dircap = self.get_old_dirhash(dirhash)
         if old_dircap:
             if self.options["verbose"]:
-                self.msg("   %s: reused" % "/".join(path))
+                self.msg("   %r: reused" % "/".join(path))
             assert isinstance(old_dircap, str)
             self.directories_reused += 1
             self.directories_used.add(old_dircap)
@@ -288,7 +288,7 @@ class Consolidator:
         if not children_modified:
             # we're allowed to use this directory as-is
             if self.options["verbose"]:
-                self.msg("   %s: used as-is" % "/".join(path))
+                self.msg("   %r: used as-is" % "/".join(path))
             new_dircap = readonly(readcap)
             assert isinstance(new_dircap, str)
             self.store_dirhash(dirhash, new_dircap)
@@ -297,7 +297,7 @@ class Consolidator:
             return new_dircap
         # otherwise, we need to create a new directory
         if self.options["verbose"]:
-            self.msg("   %s: created" % "/".join(path))
+            self.msg("   %r: created" % "/".join(path))
         new_dircap = readonly(self.mkdir(contents))
         assert isinstance(new_dircap, str)
         self.store_dirhash(dirhash, new_dircap)