ls: move opt processing to opts_from_commandline

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

diff --git a/cmd/midx-cmd.py b/cmd/midx-cmd.py
index 1879550b7c9fdb5f463ad9b957599fc45cd06bd8..0224ab40238f3239c937d5b53f67e85a4802fa02 100755 (executable)
--- a/cmd/midx-cmd.py
+++ b/cmd/midx-cmd.py
@@ -8,7 +8,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 import glob, math, os, resource, struct, sys, tempfile
 
 from bup import options, git, midx, _helpers, xstat
-from bup.helpers import (Sha1, atomically_replaced_file, debug1, fdatasync,
+from bup.helpers import (Sha1, add_error, atomically_replaced_file, debug1, fdatasync,
                          handle_ctrl_c, log, mmap_readwrite, qprogress,
                          saved_errors, unlink)
 
@@ -153,7 +153,7 @@ def _do_midx(outdir, outfilename, infilenames, prefixstr):
         print p.idxnames
         assert(len(p) == total)
         for pe, e in p, git.idxmerge(inp, final_progress=False):
-            pin = pi.next()
+            pin = next(pi)
             assert(i == pin)
             assert(p.exists(i))