Merge lp:~negronjl/charm-tools/ignore-warnings-modified-force into lp:~charmers/charm-tools/trunk

[Juan L. Negron]

[Juan L. Negron (negronjl)]

Modified force to override and promulgate on both warnings and errors
Added ignore-warnings options to promulgate with warnings.

-Juan

[Juan L. Negron (negronjl)]

Merged

=== modified file 'scripts/promulgate'
--- scripts/promulgate	2012-05-19 00:30:02 +0000
+++ scripts/promulgate	2012-05-23 17:24:19 +0000
@@ -63,6 +63,9 @@
         help='Un-promulgate this branch instead of promulgating it')
     parser.add_option(
         '-f', '--force', dest='force', action='store_true', default=False,
+        help='Override warnings and errors.  USE WITH EXTREME CARE !!!!')
+    parser.add_option(
+        '-w', '--ignore-warnings', dest='ignore-warnings', action='store_true', default=False,
         help='Promulgate this branch even with warnings from charm proof')
     options, args = parser.parse_args()
 
@@ -82,12 +85,19 @@
     print "Running charm proof ... "
     charm_proof = subprocess.call(['charm', 'proof', charm_dir])
     if charm_proof == 1 or charm_proof == 200:
-        sys.exit(1)
-    if charm_proof == 100 and options.force == True:
-        print "force option enabled ... Continuing with warnings"
+        if options.force == True:
+            print "force option enabled ... Continuing with errors"
+        else:
+            sys.exit(1)
+    if charm_proof == 100:
+        if options.ignore-warnings == True:
+            print "ignore-warnings enabled ... Continuing with warnings"
+        elif options.force == True:
+            print "force option enabled ... Continuing with warnings"
+        else:
+            sys.exit(charm_proof)
     if charm_proof == 0:
         print "Excellent ... charm proof passed with flying colors"
-    sys.exit(0)
 
     charm_metadata = os.path.join(charm_dir, 'metadata.yaml')
     if not os.access(charm_metadata, os.R_OK):