cleanup-mounts-under: Don't fail when /proc/mounts isn't readable

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

diff --git a/cmd/meta-cmd.py b/cmd/meta-cmd.py
index b557ba3a661364747188d019861036fdeb336a67..cac26b54242ea5cdb592750bb2353a35ea58eafd 100755 (executable)
--- a/cmd/meta-cmd.py
+++ b/cmd/meta-cmd.py
@@ -6,7 +6,6 @@
 # Public License as described in the bup LICENSE file.
 
 # TODO: Add tar-like -C option.
-# TODO: Add tar-like -v support to --list.
 
 import sys
 from bup import metadata
@@ -28,21 +27,30 @@ def open_output(name):
 
 optspec = """
 bup meta --create [OPTION ...] <PATH ...>
+bup meta --list [OPTION ...]
 bup meta --extract [OPTION ...]
 bup meta --start-extract [OPTION ...]
 bup meta --finish-extract [OPTION ...]
+bup meta --edit [OPTION ...] <PATH ...>
 --
 c,create       write metadata for PATHs to stdout (or --file)
 t,list         display metadata
 x,extract      perform --start-extract followed by --finish-extract
 start-extract  build tree matching metadata provided on standard input (or --file)
 finish-extract finish applying standard input (or --file) metadata to filesystem
+edit           alter metadata; write to stdout (or --file)
 f,file=        specify source or destination file
 R,recurse      recurse into subdirectories
 xdev,one-file-system  don't cross filesystem boundaries
-numeric-ids    apply numeric IDs (user, group, etc.), not names, during restore
+numeric-ids    apply numeric IDs (user, group, etc.) rather than names
 symlinks       handle symbolic links (default is true)
 paths          include paths in metadata (default is true)
+set-uid=       set metadata uid (via --edit)
+set-gid=       set metadata gid (via --edit)
+set-user=      set metadata user (via --edit)
+unset-user     remove metadata user (via --edit)
+set-group=     set metadata group (via --edit)
+unset-group    remove metadata group (via --edit)
 v,verbose      increase log output (can be used more than once)
 q,quiet        don't show progress meter
 """
@@ -50,16 +58,18 @@ q,quiet        don't show progress meter
 handle_ctrl_c()
 
 o = options.Options(optspec)
-(opt, flags, remainder) = o.parse(['--paths', '--symlinks'] + sys.argv[1:])
+(opt, flags, remainder) = o.parse(['--paths', '--symlinks', '--recurse']
+                                  + sys.argv[1:])
 
 opt.verbose = opt.verbose or 0
 opt.quiet = opt.quiet or 0
 metadata.verbose = opt.verbose - opt.quiet
 
 action_count = sum([bool(x) for x in [opt.create, opt.list, opt.extract,
-                                      opt.start_extract, opt.finish_extract]])
+                                      opt.start_extract, opt.finish_extract,
+                                      opt.edit]])
 if action_count > 1:
-    o.fatal("bup: only one action permitted: --create --list --extract")
+    o.fatal("bup: only one action permitted: --create --list --extract --edit")
 if action_count == 0:
     o.fatal("bup: no action specified")
 
@@ -95,6 +105,53 @@ elif opt.extract:
     metadata.extract(src,
                      restore_numeric_ids=opt.numeric_ids,
                      create_symlinks=opt.symlinks)
+elif opt.edit:
+    if len(remainder) < 1:
+        o.fatal("no paths specified for edit")
+    output_file = open_output(opt.file)
+
+    unset_user = False # True if --unset-user was the last relevant option.
+    unset_group = False # True if --unset-group was the last relevant option.
+    for flag in flags:
+        if flag[0] == '--set-user':
+            unset_user = False
+        elif flag[0] == '--unset-user':
+            unset_user = True
+        elif flag[0] == '--set-group':
+            unset_group = False
+        elif flag[0] == '--unset-group':
+            unset_group = True
+
+    for path in remainder:
+        f = open(path, 'r')
+        try:
+            for m in metadata._ArchiveIterator(f):
+                if opt.set_uid is not None:
+                    try:
+                        m.uid = int(opt.set_uid)
+                    except ValueError:
+                        o.fatal("uid must be an integer")
+
+                if opt.set_gid is not None:
+                    try:
+                        m.gid = int(opt.set_gid)
+                    except ValueError:
+                        o.fatal("gid must be an integer")
+
+                if unset_user:
+                    m.user = ''
+                elif opt.set_user is not None:
+                    m.user = opt.set_user
+
+                if unset_group:
+                    m.group = ''
+                elif opt.set_group is not None:
+                    m.group = opt.set_group
+
+                m.write(output_file)
+        finally:
+            f.close()
+
 
 if saved_errors:
     log('WARNING: %d errors encountered.\n' % len(saved_errors))