Officially drop support for Python 2.4.

[bup.git] / cmd / midx-cmd.py

diff --git a/cmd/midx-cmd.py b/cmd/midx-cmd.py
index 8e8fbcac5b59e2d3285020f85a1267af61f97dba..1243c8d5e63b6f65531a4beb8ee3b491f6486a62 100755 (executable)
--- a/cmd/midx-cmd.py
+++ b/cmd/midx-cmd.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import sys, math, struct, glob, resource
 import tempfile
-from bup import options, git, midx, _helpers
+from bup import options, git, midx, _helpers, xstat
 from bup.helpers import *
 
 PAGE_SIZE=4096
@@ -97,8 +97,8 @@ def _do_midx(outdir, outfilename, infilenames, prefixstr):
 
     if not _first: _first = outdir
     dirprefix = (_first != outdir) and git.repo_rel(outdir)+': ' or ''
-    log('midx: %s%screating from %d files (%d objects).\n'
-        % (dirprefix, prefixstr, len(infilenames), total))
+    debug1('midx: %s%screating from %d files (%d objects).\n'
+           % (dirprefix, prefixstr, len(infilenames), total))
     if (opt.auto and (total < 1024 and len(infilenames) < 3)) \
        or ((opt.auto or opt.force) and len(infilenames) < 2) \
        or (opt.force and not total):
@@ -123,7 +123,7 @@ def _do_midx(outdir, outfilename, infilenames, prefixstr):
     count = merge_into(fmap, bits, total, inp)
     del fmap
 
-    f.seek(0, git.SEEK_END)
+    f.seek(0, os.SEEK_END)
     f.write('\0'.join(allfilenames))
     f.close()
     os.rename(outfilename + '.tmp', outfilename)
@@ -162,7 +162,7 @@ def do_midx_dir(path):
                     
         # sort the biggest+newest midxes first, so that we can eliminate
         # smaller (or older) redundant ones that come later in the list
-        midxs.sort(key=lambda ix: (-sizes[ix], -os.stat(ix).st_mtime))
+        midxs.sort(key=lambda ix: (-sizes[ix], -xstat.stat(ix).st_mtime))
         
         for mname in midxs:
             any = 0