[Piuparts-commits] rev 547 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2009-12-07 15:02:14 +0000 (Mon, 07 Dec 2009)
New Revision: 547

Modified:
   trunk/debian/changelog
   trunk/piuparts.py
Log:
Make --help usuable without needing to be run as root. (Closes: #547379)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-12-05 21:06:33 UTC (rev 546)
+++ trunk/debian/changelog	2009-12-07 15:02:14 UTC (rev 547)
@@ -5,8 +5,9 @@
       Patrick Schoenfeld for the patch. (Closes: #559449)
     - Add support for warning on broken symlinks. Thanks to Carl Chenet for
       the patch. (Closes: #440151)  
+    - Make --help usuable without needing to be run as root. (Closes: #547379)
   * piuparts-report: report broken symlinks.
-  * Makefile: workaround 559305 by calling a2x twice.  
+  * Makefile: workaround 559305 by calling a2x twice.   
 
  -- Holger Levsen <holger at debian.org>  Fri, 04 Dec 2009 15:55:42 +0100
 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2009-12-05 21:06:33 UTC (rev 546)
+++ trunk/piuparts.py	2009-12-07 15:02:14 UTC (rev 547)
@@ -2025,6 +2025,11 @@
 
     args = parse_command_line()
 
+    # check if user has root privileges
+    if os.getuid():
+        print 'You need to be root to use piuparts.'
+        sys.exit(0)
+
     logging.info("-" * 78)
     logging.info("To quickly glance what went wrong, scroll down to the bottom of this logfile.")
     logging.info("FAQ available at http://wiki.debian.org/piuparts/FAQ")
@@ -2064,11 +2069,6 @@
 
 
 if __name__ == "__main__":
-    # check if user has root privileges
-    if os.getuid():
-        print 'You need to be root to use piuparts.'
-        sys.exit(0)
-
     try:
         if sys.argv[1:] == ["unittest"]:
             del sys.argv[1]