From: Brian Warner Date: Tue, 1 Dec 2009 02:46:07 +0000 (-0500) Subject: server.py: undo my bogus 'correction' of David-Sarah's comment fix X-Git-Url: https://git.rkrishnan.org/simplejson/components/com_hotproperty/?a=commitdiff_plain;h=1059db51f2f106b4d9c7fd61d2bf78f69b2435db;p=tahoe-lafs%2Ftahoe-lafs.git server.py: undo my bogus 'correction' of David-Sarah's comment fix and move it to a better line --- diff --git a/src/allmydata/storage/server.py b/src/allmydata/storage/server.py index e37d7cbb..2f71c71e 100644 --- a/src/allmydata/storage/server.py +++ b/src/allmydata/storage/server.py @@ -313,6 +313,7 @@ class StorageServer(service.MultiService, Referenceable): # has already been written to disk, where it will show up in # get_available_space. remaining_space -= self.allocated_size() + # self.readonly_storage causes remaining_space <= 0 # fill alreadygot with all shares that we have, not just the ones # they asked about: this will save them a lot of work. Add or update @@ -323,8 +324,6 @@ class StorageServer(service.MultiService, Referenceable): sf = ShareFile(fn) sf.add_or_renew_lease(lease_info) - # self.readonly_storage causes remaining_space=0 - for shnum in sharenums: incominghome = os.path.join(self.incomingdir, si_dir, "%d" % shnum) finalhome = os.path.join(self.sharedir, si_dir, "%d" % shnum)