import-duplicity-cmd: adjust for python 3 and enable test

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

diff --git a/cmd/rm-cmd.py b/cmd/rm-cmd.py
index b4c21422f4106810de0be1ff2b461db06bec8b1b..c0f7e55bd9ade242cac2ca69f9f4257b01cdc695 100755 (executable)
--- a/cmd/rm-cmd.py
+++ b/cmd/rm-cmd.py
@@ -5,11 +5,14 @@ exec "$bup_python" "$0" ${1+"$@"}
 """
 # end of bup preamble
 
+from __future__ import absolute_import
 import sys
 
+from bup.compat import argv_bytes
 from bup.git import check_repo_or_die
 from bup.options import Options
 from bup.helpers import die_if_errors, handle_ctrl_c, log
+from bup.repo import LocalRepo
 from bup.rm import bup_rm
 
 optspec = """
@@ -32,5 +35,7 @@ if len(extra) < 1:
     o.fatal('no paths specified')
 
 check_repo_or_die()
-bup_rm(extra, compression=opt.compress, verbosity=opt.verbose)
+repo = LocalRepo()
+bup_rm(repo, [argv_bytes(x) for x in extra],
+       compression=opt.compress, verbosity=opt.verbose)
 die_if_errors()