heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MountStorage: Improve mounting asserts

Browse Source 
The asserts now differentiate between mounting on the same
path and mounting over a shorter path.
This commit is contained in:
Elrond 2011-08-08 21:51:11 +02:00
parent 255f02c486
commit 620fca5472
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/storage.py
View File

@ -313,13 +313,16 @@ class MountStorage(StorageInterface):
print "Mounting:", repr(new_ent) print "Mounting:", repr(new_ent)
already, rem_1, table, rem_2 = self._resolve_to_backend(new_ent, True) already, rem_1, table, rem_2 = self._resolve_to_backend(new_ent, True)
print "===", repr(already), repr(rem_1), repr(rem_2) print "===", repr(already), repr(rem_1), repr(rem_2), len(table)
assert (len(rem_2) > 0) or (None not in table), \
"That path is already mounted"
assert (len(rem_2) > 0) or (len(table)==0), \
"A longer path is already mounted here"
assert (already is None) or (len(rem_2) > 0), "Already mounted"
for part in rem_2: for part in rem_2:
table[part] = {} table[part] = {}
table = table[part] table = table[part]
assert not table.has_key(None), "Huh? Already mounted?!"
table[None] = backend table[None] = backend
def _resolve_to_backend(self, filepath, extra_info = False): def _resolve_to_backend(self, filepath, extra_info = False):