Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg into jenner

1 files changed, 16 insertions, 9 deletions

diff --git a/src/commit2.c b/src/commit2.c
index 6d358c5..871c085 100644
--- a/src/commit2.c
+++ b/src/commit2.c
@@ -95,13 +95,14 @@ void
 usage()
 {
   printf("commit2\n");
-  printf("-d\t\tdebug mode\n");
-  printf("-s\t\tdump sorted transactions and exit\n");
-  printf("-p\t\tdisable priority mode\n");
-  printf("-t\t\ttest mode (don't apply directory modifications)\n");
-  printf("-e\t\tprint node where error occurred\n");
-  printf("-c\t\tdump node coverage and execution times\n");
-  printf("-h\t\thelp\n");
+  printf("\t-d\t\tdebug mode\n");
+  printf("\t-s\t\tdump sorted transactions and exit\n");
+  printf("\t-p\t\tdisable priority mode\n");
+  printf("\t-t\t\ttest mode (don't apply directory modifications)\n");
+  printf("\t-e\t\tprint node where error occurred\n");
+  printf("\t-c\t\tdump node coverage and execution times\n");
+  printf("\t-o\t\tdisable partial commit\n");
+  printf("\t-h\t\thelp\n");
 }
 
 /**
@@ -114,9 +115,10 @@ main(int argc, char** argv)
   int ch;
   boolean priority_mode = TRUE;
   boolean test_mode = FALSE;
+  boolean disable_partial_commit = FALSE;
 
   //grab inputs
-  while ((ch = getopt(argc, argv, "dpthsec")) != -1) {
+  while ((ch = getopt(argc, argv, "dpthseco")) != -1) {
     switch (ch) {
     case 'd':
       g_debug = TRUE;
@@ -140,6 +142,9 @@ main(int argc, char** argv)
     case 'c':
       g_coverage = TRUE;
       break;
+    case 'o':
+      disable_partial_commit = TRUE;
+      break;
     default:
       usage();
       exit(0);
@@ -214,7 +219,9 @@ main(int argc, char** argv)
 	//no op, need better way to define true root
       }
       else {
-	complete(comp_cp_node, test_mode);
+	if (disable_partial_commit == FALSE) {
+	  complete(comp_cp_node, test_mode);
+	}
       }
     }