Merge lp:~javier.collado/utah/bug1126219 into lp:utah

[Javier Collado]

In this branch, user group is checked after parsing arguments. This way
-h/--help can be used even when running the run scripts with a user that isn't
a member of the utah group.

[Andy Doan (doanac)]

+1 - thank you

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-29 12:27:37 +0000
+++ debian/changelog	2013-04-01 11:59:23 +0000
@@ -3,6 +3,7 @@
   * Return error code on unhandled error (LP: #1160857)
   * Remove temporary files downloaded based on URL (LP: #1101186)
   * Stop server on installation failure (LP: #1161855)
+  * Check group after command line argument parsing (LP: #1126219)
 
  -- Javier Collado <[e-mail]>  Wed, 27 Mar 2013 13:00:47 +0100
 

=== modified file 'examples/run_install_test.py'
--- examples/run_install_test.py	2013-03-28 11:55:27 +0000
+++ examples/run_install_test.py	2013-04-01 11:59:23 +0000
@@ -53,13 +53,13 @@
 
 
 def run_install_test(args=None):
+    if args is None:
+        args = get_parser().parse_args()
+
     if not check_user_group():
         print_group_error_message(__file__)
         sys.exit(ReturnCodes.GROUP_ERROR)
 
-    if args is None:
-        args = get_parser().parse_args()
-
     locallogs = []
     exitstatus = ReturnCodes.SUCCESS
     machine = None

=== modified file 'examples/run_test_bamboo_feeder.py'
--- examples/run_test_bamboo_feeder.py	2013-03-28 11:55:27 +0000
+++ examples/run_test_bamboo_feeder.py	2013-04-01 11:59:23 +0000
@@ -54,13 +54,13 @@
 
 
 def run_test_bamboo_feeder(args=None):
+    if args is None:
+        args = get_parser().parse_args()
+
     if not check_user_group():
         print_group_error_message(__file__)
         sys.exit(ReturnCodes.GROUP_ERROR)
 
-    if args is None:
-        args = get_parser().parse_args()
-
     locallogs = []
     exitstatus = ReturnCodes.SUCCESS
     machine = None

=== modified file 'examples/run_test_cobbler.py'
--- examples/run_test_cobbler.py	2013-03-28 11:55:27 +0000
+++ examples/run_test_cobbler.py	2013-04-01 11:59:23 +0000
@@ -53,13 +53,13 @@
 
 
 def run_test_cobbler(args=None):
+    if args is None:
+        args = get_parser().parse_args()
+
     if not check_user_group():
         print_group_error_message(__file__)
         sys.exit(ReturnCodes.GROUP_ERROR)
 
-    if args is None:
-        args = get_parser().parse_args()
-
     locallogs = []
     exitstatus = ReturnCodes.SUCCESS
     machine = None

=== modified file 'examples/run_test_vm.py'
--- examples/run_test_vm.py	2013-03-28 11:55:27 +0000
+++ examples/run_test_vm.py	2013-04-01 11:59:23 +0000
@@ -46,13 +46,13 @@
 
 
 def run_test_vm(args=None):
+    if args is None:
+        args = get_parser().parse_args()
+
     if not check_user_group():
         print_group_error_message(__file__)
         sys.exit(ReturnCodes.GROUP_ERROR)
 
-    if args is None:
-        args = get_parser().parse_args()
-
     locallogs = []
     exitstatus = ReturnCodes.SUCCESS
     machine = None

=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2013-03-28 11:55:27 +0000
+++ examples/run_utah_tests.py	2013-04-01 11:59:23 +0000
@@ -68,13 +68,13 @@
 
 
 def run_utah_tests(args=None):
+    if args is None:
+        args = get_parser().parse_args()
+
     if not check_user_group():
         print_group_error_message(__file__)
         sys.exit(ReturnCodes.GROUP_ERROR)
 
-    if args is None:
-        args = get_parser().parse_args()
-
     if args.machinetype is None:
         machinetype = config.machinetype
     else: