Remove bup: prefix from metadata error messages.

diff --git a/lib/bup/metadata.py b/lib/bup/metadata.py
index 57539fecc5e37677badccb29b3d03e2ebad8e803..927c5cffe0581b66048ac255bd611f4019d9b414 100644 (file)
--- a/lib/bup/metadata.py
+++ b/lib/bup/metadata.py
@@ -281,7 +281,7 @@ class Metadata:
             if not restore_numeric_ids:
                 if not self.owner:
                     uid = -1
-                    add_error('bup: ignoring missing owner for "%s"\n' % path)
+                    add_error('ignoring missing owner for "%s"\n' % path)
                 else:
                     if os.geteuid() != 0:
                         uid = -1 # Not root; assume we can't change owner.
@@ -290,17 +290,17 @@ class Metadata:
                             uid = pwd.getpwnam(self.owner)[2]
                         except KeyError:
                             uid = -1
-                            fmt = 'bup: ignoring unknown owner %s for "%s"\n'
+                            fmt = 'ignoring unknown owner %s for "%s"\n'
                             add_error(fmt % (self.owner, path))
                 if not self.group:
                     gid = -1
-                    add_error('bup: ignoring missing group for "%s"\n' % path)
+                    add_error('ignoring missing group for "%s"\n' % path)
                 else:
                     try:
                         gid = grp.getgrnam(self.group)[2]
                     except KeyError:
                         gid = -1
-                        add_error('bup: ignoring unknown group %s for "%s"\n'
+                        add_error('ignoring unknown group %s for "%s"\n'
                                   % (self.group, path))
 
             try:
@@ -415,7 +415,7 @@ class Metadata:
                     self.linux_attr = get_linux_file_attr(path)
             except EnvironmentError, e:
                 if e.errno == errno.EACCES:
-                    add_error('bup: unable to read Linux attr for "%s"' % path)
+                    add_error('unable to read Linux attr for "%s"' % path)
                 else:
                     raise
 
@@ -565,7 +565,7 @@ def save_tree(output_file, paths,
     for path in paths:
         safe_path = _clean_up_path_for_archive(path)
         if(safe_path != path):
-            log('bup: archiving "%s" as "%s"\n' % (path, safe_path))
+            log('archiving "%s" as "%s"\n' % (path, safe_path))
 
     start_dir = os.getcwd()
     try:

diff --git a/lib/bup/t/tmetadata.py b/lib/bup/t/tmetadata.py
index dadd6eed757b417b4ce15342e4574be557b8d72c..6295ad3692110a8288f4f119e7dc6ee5537529d3 100644 (file)
--- a/lib/bup/t/tmetadata.py
+++ b/lib/bup/t/tmetadata.py
@@ -88,7 +88,7 @@ def test_from_path_error():
         subprocess.call(['chmod', '000', path])
         metadata.from_path(path, archive_path=path, save_symlinks=True)
         errmsg = helpers.saved_errors[0] if helpers.saved_errors else ''
-        WVPASS(errmsg.startswith('bup: unable to read Linux attr'))
+        WVPASS(errmsg.startswith('unable to read Linux attr'))
         clear_errors()
     finally:
         subprocess.call(['rm', '-rf', tmpdir])