Rewrite parametrize to use new parametrizeWithVars

[wizard.git] / wizard / shell.py

diff --git a/wizard/shell.py b/wizard/shell.py
index 687071205a14fe12a63557dc722a0b20f3195e24..723b50d4e533357cead8d952975ca97e405cae5c 100644 (file)
--- a/wizard/shell.py
+++ b/wizard/shell.py
@@ -194,6 +194,8 @@ class Shell(object):
         on working directory context.  Keyword arguments are the
         same as :meth:`call`.
         """
+        if os.getuid():
+            return self.call(*args, **kwargs)
         uid = os.stat(os.getcwd()).st_uid
         # consider also checking ruid?
         if uid != os.geteuid():
@@ -313,6 +315,12 @@ class ParallelShell(Shell):
             return
         on_success(stdout, stderr)
 
+# Setup a convenience global instance
+shell = Shell()
+call = shell.call
+callAsUser = shell.callAsUser
+safeCall = shell.safeCall
+eval = shell.eval
 
 class DummyParallelShell(ParallelShell):
     """Same API as :class:`ParallelShell`, but doesn't actually