bup_rm: take opts as individual arguments

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/cmd/rm-cmd.py b/cmd/rm-cmd.py
index 022ebb6736e7c5b45e9d603425293affb5eeafc0..b4c21422f4106810de0be1ff2b461db06bec8b1b 100755 (executable)
--- a/cmd/rm-cmd.py
+++ b/cmd/rm-cmd.py
@@ -32,5 +32,5 @@ if len(extra) < 1:
     o.fatal('no paths specified')
 
 check_repo_or_die()
-bup_rm(extra, opt)
+bup_rm(extra, compression=opt.compress, verbosity=opt.verbose)
 die_if_errors()

diff --git a/lib/bup/rm.py b/lib/bup/rm.py
index 5365a7ddac1883fb87b0f92f0ac11ea552368c06..9eb810b2173998224b599fe1cffa50ad058f8768 100644 (file)
--- a/lib/bup/rm.py
+++ b/lib/bup/rm.py
@@ -85,7 +85,7 @@ def dead_items(vfs_top, paths):
     return dead_branches, dead_saves
 
 
-def bup_rm(paths, opt):
+def bup_rm(paths, compression=6, verbosity=None):
     root = vfs.RefList(None)
 
     dead_branches, dead_saves = dead_items(root, paths)
@@ -95,7 +95,7 @@ def bup_rm(paths, opt):
 
     writer = None
     if dead_saves:
-        writer = git.PackWriter(compression_level=opt.compress)
+        writer = git.PackWriter(compression_level=compression)
 
     try:
         for branch, saves in dead_saves.iteritems():
@@ -124,7 +124,7 @@ def bup_rm(paths, opt):
                 git.delete_ref(ref_name, orig_ref.encode('hex'))
             else:
                 git.update_ref(ref_name, new_ref, orig_ref)
-                if opt.verbose:
+                if verbosity:
                     new_hex = new_ref.encode('hex')
                     if orig_ref:
                         orig_hex = orig_ref.encode('hex')