From 40edf8f419947b804a54020ddd1c80035df9e9f7 Mon Sep 17 00:00:00 2001 From: david-sarah Date: Fri, 26 Feb 2010 22:55:51 -0800 Subject: [PATCH] Change code that gives a base32 SI or an empty string to be more straightforward. (#948) --- src/allmydata/dirnode.py | 6 +++++- src/allmydata/web/directory.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/allmydata/dirnode.py b/src/allmydata/dirnode.py index dc268f65..fca772b9 100644 --- a/src/allmydata/dirnode.py +++ b/src/allmydata/dirnode.py @@ -830,9 +830,13 @@ class ManifestWalker(DeepStats): class DeepChecker: def __init__(self, root, verify, repair, add_lease): root_si = root.get_storage_index() + if root_si: + root_si_base32 = base32.b2a(root_si) + else: + root_si_base32 = "" self._lp = log.msg(format="deep-check starting (%(si)s)," " verify=%(verify)s, repair=%(repair)s", - si=base32.b2a(root_si or ""), verify=verify, repair=repair) + si=root_si_base32, verify=verify, repair=repair) self._verify = verify self._repair = repair self._add_lease = add_lease diff --git a/src/allmydata/web/directory.py b/src/allmydata/web/directory.py index d83def22..f01cd1d7 100644 --- a/src/allmydata/web/directory.py +++ b/src/allmydata/web/directory.py @@ -923,9 +923,13 @@ class ManifestResults(rend.Page, ReloadMixin): m = self.monitor s = m.get_status() + if m.origin_si: + origin_base32 = base32.b2a(m.origin_si) + else: + origin_base32 = "" status = { "stats": s["stats"], "finished": m.is_finished(), - "origin": base32.b2a(m.origin_si or ""), + "origin": origin_base32, } if m.is_finished(): # don't return manifest/verifycaps/SIs unless the operation is -- 2.45.2