]> arthur.barton.de Git - bup.git/commitdiff
cmd/save: oops, missing a mangle_name() call.
authorAvery Pennarun <apenwarr@gmail.com>
Mon, 4 Oct 2010 03:02:20 +0000 (20:02 -0700)
committerAvery Pennarun <apenwarr@gmail.com>
Mon, 4 Oct 2010 03:03:05 +0000 (20:03 -0700)
Directories with names ending in '.bup' - including ~/.bup, sigh - didn't
get the .bupl suffix added, thus making their sizes not calculate correctly.

Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
cmd/save-cmd.py
lib/bup/vfs.py

index 5b48afdc9079bfa0119f341cd0950c8a7cf506a0..5eaa5d969a72c2cd24a862df33dd762deca9891a 100755 (executable)
@@ -79,7 +79,9 @@ def _pop(force_tree):
     shalist = shalists.pop()
     tree = force_tree or w.new_tree(shalist)
     if shalists:
-        shalists[-1].append(('40000', part, tree))
+        shalists[-1].append(('40000',
+                             git.mangle_name(part, 040000, 40000),
+                             tree))
     else:  # this was the toplevel, so put it back for sanity
         shalists.append(shalist)
     return tree
index 9baa6b5f48f200affb3d80fbf23dd31688964979..00707ce56a447416a06ffaa5cf4120922b9626ab 100644 (file)
@@ -312,7 +312,7 @@ class File(Node):
     def size(self):
         """Get this file's size."""
         if self._cached_size == None:
-            debug1('<<<<File.size() is calculating...\n')
+            debug1('<<<<File.size() is calculating (for %r)...\n' % self.name)
             if self.bupmode == git.BUP_CHUNKED:
                 self._cached_size = _total_size(self.hash)
             else: