From 20fcdad802c66c127f41adb565f756b5cd422373 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 6 Aug 2016 09:26:40 -0500 Subject: [PATCH] bup_rm: take opts as individual arguments Signed-off-by: Rob Browning Tested-by: Rob Browning --- cmd/rm-cmd.py | 2 +- lib/bup/rm.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/rm-cmd.py b/cmd/rm-cmd.py index 022ebb6..b4c2142 100755 --- 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 5365a7d..9eb810b 100644 --- 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') -- 2.39.2