From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Fri, 10 Jul 2009 03:20:28 +0000 (-0700)
Subject: directories: fix semantic conflict between my "keep track of position" optimization... 
X-Git-Url: https://git.rkrishnan.org/listings/reedownlee?a=commitdiff_plain;h=34213cd2c70246f3159cee51c03ca9de27bcc23e;p=tahoe-lafs%2Ftahoe-lafs.git

directories: fix semantic conflict between my "keep track of position" optimization patch and Kevan's "cache serialized entries" optimization patch
---

diff --git a/src/allmydata/dirnode.py b/src/allmydata/dirnode.py
index 67dde076..e85a5dea 100644
--- a/src/allmydata/dirnode.py
+++ b/src/allmydata/dirnode.py
@@ -230,7 +230,8 @@ class NewDirectoryNode:
         position = 0
         while position < len(data):
             entries, position = split_netstring(data, 1, position)
-            (name, rocap, rwcapdata, metadata_s), subpos = split_netstring(entries[0], 4)
+            entry = entries[0]
+            (name, rocap, rwcapdata, metadata_s), subpos = split_netstring(entry, 4)
             name = name.decode("utf-8")
             rwcap = None
             if writeable: