Fossil SCM
Found two more places that fQuiet should have been checked.
Commit
137d653a065d0d6adb6d96e6141a8a17635cc8d7
Parent
dccd27c6da34c08…
1 file changed
+9
-4
+9
-4
| --- src/rebuild.c | ||
| +++ src/rebuild.c | ||
| @@ -91,12 +91,14 @@ | ||
| 91 | 91 | static void rebuild_step_done(rid){ |
| 92 | 92 | /* assert( bag_find(&bagDone, rid)==0 ); */ |
| 93 | 93 | bag_insert(&bagDone, rid); |
| 94 | 94 | if( ttyOutput ){ |
| 95 | 95 | processCnt++; |
| 96 | - printf("%d (%d%%)...\r", processCnt, (processCnt*100/totalSize)); | |
| 97 | - fflush(stdout); | |
| 96 | + if (!g.fQuiet) { | |
| 97 | + printf("%d (%d%%)...\r", processCnt, (processCnt*100/totalSize)); | |
| 98 | + fflush(stdout); | |
| 99 | + } | |
| 98 | 100 | } |
| 99 | 101 | } |
| 100 | 102 | |
| 101 | 103 | /* |
| 102 | 104 | ** Rebuild cross-referencing information for the artifact |
| @@ -206,11 +208,14 @@ | ||
| 206 | 208 | char *zTable; |
| 207 | 209 | |
| 208 | 210 | bag_init(&bagDone); |
| 209 | 211 | ttyOutput = doOut; |
| 210 | 212 | processCnt = 0; |
| 211 | - printf("0 (0%%)...\r"); fflush(stdout); | |
| 213 | + if (!g.fQuiet) { | |
| 214 | + printf("0 (0%%)...\r"); | |
| 215 | + fflush(stdout); | |
| 216 | + } | |
| 212 | 217 | db_multi_exec(zSchemaUpdates); |
| 213 | 218 | for(;;){ |
| 214 | 219 | zTable = db_text(0, |
| 215 | 220 | "SELECT name FROM sqlite_master" |
| 216 | 221 | " WHERE type='table'" |
| @@ -273,11 +278,11 @@ | ||
| 273 | 278 | } |
| 274 | 279 | } |
| 275 | 280 | db_finalize(&s); |
| 276 | 281 | manifest_crosslink_end(); |
| 277 | 282 | rebuild_tag_trunk(); |
| 278 | - if( ttyOutput ){ | |
| 283 | + if(!g.fQuiet && ttyOutput ){ | |
| 279 | 284 | printf("\n"); |
| 280 | 285 | } |
| 281 | 286 | return errCnt; |
| 282 | 287 | } |
| 283 | 288 | |
| 284 | 289 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -91,12 +91,14 @@ | |
| 91 | static void rebuild_step_done(rid){ |
| 92 | /* assert( bag_find(&bagDone, rid)==0 ); */ |
| 93 | bag_insert(&bagDone, rid); |
| 94 | if( ttyOutput ){ |
| 95 | processCnt++; |
| 96 | printf("%d (%d%%)...\r", processCnt, (processCnt*100/totalSize)); |
| 97 | fflush(stdout); |
| 98 | } |
| 99 | } |
| 100 | |
| 101 | /* |
| 102 | ** Rebuild cross-referencing information for the artifact |
| @@ -206,11 +208,14 @@ | |
| 206 | char *zTable; |
| 207 | |
| 208 | bag_init(&bagDone); |
| 209 | ttyOutput = doOut; |
| 210 | processCnt = 0; |
| 211 | printf("0 (0%%)...\r"); fflush(stdout); |
| 212 | db_multi_exec(zSchemaUpdates); |
| 213 | for(;;){ |
| 214 | zTable = db_text(0, |
| 215 | "SELECT name FROM sqlite_master" |
| 216 | " WHERE type='table'" |
| @@ -273,11 +278,11 @@ | |
| 273 | } |
| 274 | } |
| 275 | db_finalize(&s); |
| 276 | manifest_crosslink_end(); |
| 277 | rebuild_tag_trunk(); |
| 278 | if( ttyOutput ){ |
| 279 | printf("\n"); |
| 280 | } |
| 281 | return errCnt; |
| 282 | } |
| 283 | |
| 284 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -91,12 +91,14 @@ | |
| 91 | static void rebuild_step_done(rid){ |
| 92 | /* assert( bag_find(&bagDone, rid)==0 ); */ |
| 93 | bag_insert(&bagDone, rid); |
| 94 | if( ttyOutput ){ |
| 95 | processCnt++; |
| 96 | if (!g.fQuiet) { |
| 97 | printf("%d (%d%%)...\r", processCnt, (processCnt*100/totalSize)); |
| 98 | fflush(stdout); |
| 99 | } |
| 100 | } |
| 101 | } |
| 102 | |
| 103 | /* |
| 104 | ** Rebuild cross-referencing information for the artifact |
| @@ -206,11 +208,14 @@ | |
| 208 | char *zTable; |
| 209 | |
| 210 | bag_init(&bagDone); |
| 211 | ttyOutput = doOut; |
| 212 | processCnt = 0; |
| 213 | if (!g.fQuiet) { |
| 214 | printf("0 (0%%)...\r"); |
| 215 | fflush(stdout); |
| 216 | } |
| 217 | db_multi_exec(zSchemaUpdates); |
| 218 | for(;;){ |
| 219 | zTable = db_text(0, |
| 220 | "SELECT name FROM sqlite_master" |
| 221 | " WHERE type='table'" |
| @@ -273,11 +278,11 @@ | |
| 278 | } |
| 279 | } |
| 280 | db_finalize(&s); |
| 281 | manifest_crosslink_end(); |
| 282 | rebuild_tag_trunk(); |
| 283 | if(!g.fQuiet && ttyOutput ){ |
| 284 | printf("\n"); |
| 285 | } |
| 286 | return errCnt; |
| 287 | } |
| 288 | |
| 289 |