Merge branch 'master' into meta

[bup.git] / lib / bup / metadata.py

diff --git a/lib/bup/metadata.py b/lib/bup/metadata.py
index aecf740a13c3507559b4bf56b638acde901ffb50..46d04b9e162d5eb73e6100cfa6a9da4b61329f92 100644 (file)
--- a/lib/bup/metadata.py
+++ b/lib/bup/metadata.py
@@ -8,8 +8,8 @@ import errno, os, sys, stat, pwd, grp, struct, re
 from cStringIO import StringIO
 from bup import vint, xstat
 from bup.drecurse import recursive_dirlist
-from bup.helpers import add_error, mkdirp, log
-from bup.xstat import utime, lutime
+from bup.helpers import add_error, mkdirp, log, is_superuser
+from bup.xstat import utime, lutime, lstat
 import bup._helpers as _helpers
 
 try:
@@ -312,7 +312,7 @@ class Metadata:
                 uid = -1
                 add_error('ignoring missing owner for "%s"\n' % path)
             else:
-                if os.geteuid() != 0:
+                if not is_superuser():
                     uid = -1 # Not root; assume we can't change owner.
                 else:
                     try: