Adjust rm-cmd and bup.rm for python 3 and enable test-rm

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

diff --git a/cmd/rm-cmd.py b/cmd/rm-cmd.py
index 3464e3c3078ca874494153a72effc553b1b15572..c0f7e55bd9ade242cac2ca69f9f4257b01cdc695 100755 (executable)
--- a/cmd/rm-cmd.py
+++ b/cmd/rm-cmd.py
@@ -8,6 +8,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 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
@@ -35,5 +36,6 @@ if len(extra) < 1:
 
 check_repo_or_die()
 repo = LocalRepo()
-bup_rm(repo, extra, compression=opt.compress, verbosity=opt.verbose)
+bup_rm(repo, [argv_bytes(x) for x in extra],
+       compression=opt.compress, verbosity=opt.verbose)
 die_if_errors()