From 06bf443e914706e0f87cad9b0ccdcfbca5ea80e6 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 12 Mar 2009 23:54:02 -0700 Subject: [PATCH] consolidate: tolerate unicode dirnames --- src/allmydata/scripts/consolidate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) -- 2.45.2