From 8fcaaa5c88234a6141ec15610777d1b70910c97d Mon Sep 17 00:00:00 2001
From: Sebastian Hahn <sebastian@torproject.org>
Date: Mon, 1 Jun 2009 14:40:17 +0200
Subject: All current versions of Thandy have length fields

---
 lib/thandy/formats.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/thandy')

diff --git a/lib/thandy/formats.py b/lib/thandy/formats.py
index b8bdf5b..f59995a 100644
--- a/lib/thandy/formats.py
+++ b/lib/thandy/formats.py
@@ -438,7 +438,7 @@ BUNDLE_SCHEMA = S.Obj(
                     version=VERSION_SCHEMA,
                     path=RELPATH_SCHEMA,
                     hash=HASH_SCHEMA,
-                    length=S.Opt(LENGTH_SCHEMA),
+                    length=LENGTH_SCHEMA,
                     order=S.Struct([S.Int(), S.Int(), S.Int()]),
                     optional=S.Opt(S.Bool()),
                     gloss=S.DictOf(S.AnyStr(), S.AnyStr()),
@@ -771,9 +771,7 @@ def makeBundleObj(config_fname, getPackage, getPackageLength):
             raise thandy.FormatException("No such package as %s"%p['name'])
 
         p['hash'] = formatHash(getDigest(pkginfo))
-        length = getPackageLength(p['name'])
-        if length != None:
-            p['length'] = length
+        p['length'] = getPackageLength(p['name'])
         if p['path'] == None:
             p['path'] = pkginfo['location']
         if p['version'] == None:
-- 
cgit v1.2.3