Report unknown root status if getwindowsversion > 5

Apparently the situation is much more complicated in newer versions, so
until someone more knowledgable can help, don't try to determine
superuser status there.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/helpers.py b/lib/bup/helpers.py
index 385647ec1b8f1d90e2b5ccba7f69c38626a4e55e..394e7a6067d07a663005d7d65abd578bde96e2ba 100644 (file)
--- a/lib/bup/helpers.py
+++ b/lib/bup/helpers.py
@@ -284,8 +284,16 @@ def detect_fakeroot():
     return os.getenv("FAKEROOTKEY") != None
 
 
+_warned_about_superuser_detection = None
 def is_superuser():
     if sys.platform.startswith('cygwin'):
+        if sys.getwindowsversion()[0] > 5:
+            # Sounds like situation is much more complicated here
+            global _warned_about_superuser_detection
+            if not _warned_about_superuser_detection:
+                log("can't detect root status for OS version > 5; assuming not root")
+                _warned_about_superuser_detection = True
+            return False
         import ctypes
         return ctypes.cdll.shell32.IsUserAnAdmin()
     else:

diff --git a/t/root-status b/t/root-status
index 5024ed3afb29b1976c5dfc4635542895adf34ccf..4f21599f83aaacb98c83b8ccbb1d0b9989d2d0fb 100755 (executable)
--- a/t/root-status
+++ b/t/root-status
@@ -5,9 +5,15 @@ exec "$bup_python" "$0" ${1+"$@"}
 """
 # end of bup preamble
 
+from sys import stderr
 import sys
 
+
 if sys.platform.startswith('cygwin'):
+    if sys.getwindowsversion()[0] > 5:
+        # Sounds like the situation is much more complicated here
+        print >> stderr, "can't detect root status for OS version > 5; assuming not root"
+        print 'none'
     import ctypes
     if ctypes.cdll.shell32.IsUserAnAdmin():
         print 'root'