Diff
Not logged in

Differences From:

File src/rebuild.c part of check-in [6ae51190cc] - reserve the use of brackets in stdout for artifacts by rwilson on 2009-12-10 02:19:16. Also file src/rebuild.c part of check-in [1c2d878d12] - Merge with trunk by btheado on 2009-12-13 01:16:13. [view]

To:

File src/rebuild.c part of check-in [137d653a06] - Found two more places that fQuiet should have been checked. by jeremy_c on 2009-12-14 23:26:03. Also file src/rebuild.c part of check-in [76bc05d739] - merge with trunk by btheado on 2009-12-30 20:33:59. [view]

@@ -92,10 +92,12 @@
   /* assert( bag_find(&bagDone, rid)==0 ); */
   bag_insert(&bagDone, rid);
   if( ttyOutput ){
     processCnt++;
-    printf("%d (%d%%)...\r", processCnt, (processCnt*100/totalSize));
-    fflush(stdout);
+    if (!g.fQuiet) {
+      printf("%d (%d%%)...\r", processCnt, (processCnt*100/totalSize));
+      fflush(stdout);
+    }
   }
 }
 
 /*
@@ -207,9 +209,12 @@
 
   bag_init(&bagDone);
   ttyOutput = doOut;
   processCnt = 0;
-  printf("0 (0%%)...\r"); fflush(stdout);
+  if (!g.fQuiet) {
+    printf("0 (0%%)...\r");
+    fflush(stdout);
+  }
   db_multi_exec(zSchemaUpdates);
   for(;;){
     zTable = db_text(0,
        "SELECT name FROM sqlite_master"
@@ -274,9 +279,9 @@
   }
   db_finalize(&s);
   manifest_crosslink_end();
   rebuild_tag_trunk();
-  if( ttyOutput ){
+  if(!g.fQuiet && ttyOutput ){
     printf("\n");
   }
   return errCnt;
 }