# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sami.saada@gmail.com-20100502235311-hndahpnmto0obnb7
# target_branch: bzr+ssh://bazaar.launchpad.net/~openfilepad-\
#   maintainers/qfriendslol/main/
# testament_sha1: 7343dd85985bfb183b0c9340d79cceff211ac510
# timestamp: 2010-05-03 02:54:26 +0300
# base_revision_id: sami.saada@gmail.com-20100502220141-\
#   z41ms0hmccmshnd8
# 
# Begin patch
=== modified file 'src/remote.py'
--- src/remote.py	2010-05-02 15:53:52 +0000
+++ src/remote.py	2010-05-02 23:53:11 +0000
@@ -15,7 +15,7 @@
 # various places.
 
 from openlookup.client.singleton import Proxy
-from openlookup.engine.item import create_singleton_item, MAX_VALUE_SIZE
+from openlookup.engine.item import create_singleton_item, MAX_VALUE_SIZE, InvalidItem
 from openlookup.client.keychain import KeyChain, NotFound, Ambiguous
 import simplejson as json
 import time
@@ -89,7 +89,10 @@
     def next(self):
         assert self.ready < self.blocks #download incomplete
         key = self._FILE_T % str(self.ready + 1)
-        block = self.get(key.encode('utf8'), self.userid)
+        try:
+            block = self.get(key.encode('utf8'), self.userid)
+        except InvalidItem:
+            return None
         if self._lastone():
             if len(block) % MAX_VALUE_SIZE != self.filesize % MAX_VALUE_SIZE:
                  raise Error('invalid tail_block')

# Begin bundle
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