Fossil SCM
Fix three remaining instances of printing rebuild progress in CGI mode. Ticket [19be0265ff].
Commit
2cd21f8dc2ec202e3ef4d771fd3d4ab426b98e7b
Parent
e1ea6c26d05317f…
1 file changed
+3
-3
+3
-3
| --- src/rebuild.c | ||
| +++ src/rebuild.c | ||
| @@ -338,11 +338,11 @@ | ||
| 338 | 338 | int incrSize; |
| 339 | 339 | |
| 340 | 340 | bag_init(&bagDone); |
| 341 | 341 | ttyOutput = doOut; |
| 342 | 342 | processCnt = 0; |
| 343 | - if (!g.fQuiet) { | |
| 343 | + if (ttyOutput && !g.fQuiet) { | |
| 344 | 344 | percent_complete(0); |
| 345 | 345 | } |
| 346 | 346 | rebuild_update_schema(); |
| 347 | 347 | for(;;){ |
| 348 | 348 | zTable = db_text(0, |
| @@ -410,16 +410,16 @@ | ||
| 410 | 410 | } |
| 411 | 411 | } |
| 412 | 412 | db_finalize(&s); |
| 413 | 413 | manifest_crosslink_end(); |
| 414 | 414 | rebuild_tag_trunk(); |
| 415 | - if( !g.fQuiet && totalSize>0 ){ | |
| 415 | + if( ttyOutput && !g.fQuiet && totalSize>0 ){ | |
| 416 | 416 | processCnt += incrSize; |
| 417 | 417 | percent_complete((processCnt*1000)/totalSize); |
| 418 | 418 | } |
| 419 | 419 | if( doClustering ) create_cluster(); |
| 420 | - if( !g.fQuiet && totalSize>0 ){ | |
| 420 | + if( ttyOutput && !g.fQuiet && totalSize>0 ){ | |
| 421 | 421 | processCnt += incrSize; |
| 422 | 422 | percent_complete((processCnt*1000)/totalSize); |
| 423 | 423 | } |
| 424 | 424 | if(!g.fQuiet && ttyOutput ){ |
| 425 | 425 | fossil_print("\n"); |
| 426 | 426 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -338,11 +338,11 @@ | |
| 338 | int incrSize; |
| 339 | |
| 340 | bag_init(&bagDone); |
| 341 | ttyOutput = doOut; |
| 342 | processCnt = 0; |
| 343 | if (!g.fQuiet) { |
| 344 | percent_complete(0); |
| 345 | } |
| 346 | rebuild_update_schema(); |
| 347 | for(;;){ |
| 348 | zTable = db_text(0, |
| @@ -410,16 +410,16 @@ | |
| 410 | } |
| 411 | } |
| 412 | db_finalize(&s); |
| 413 | manifest_crosslink_end(); |
| 414 | rebuild_tag_trunk(); |
| 415 | if( !g.fQuiet && totalSize>0 ){ |
| 416 | processCnt += incrSize; |
| 417 | percent_complete((processCnt*1000)/totalSize); |
| 418 | } |
| 419 | if( doClustering ) create_cluster(); |
| 420 | if( !g.fQuiet && totalSize>0 ){ |
| 421 | processCnt += incrSize; |
| 422 | percent_complete((processCnt*1000)/totalSize); |
| 423 | } |
| 424 | if(!g.fQuiet && ttyOutput ){ |
| 425 | fossil_print("\n"); |
| 426 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -338,11 +338,11 @@ | |
| 338 | int incrSize; |
| 339 | |
| 340 | bag_init(&bagDone); |
| 341 | ttyOutput = doOut; |
| 342 | processCnt = 0; |
| 343 | if (ttyOutput && !g.fQuiet) { |
| 344 | percent_complete(0); |
| 345 | } |
| 346 | rebuild_update_schema(); |
| 347 | for(;;){ |
| 348 | zTable = db_text(0, |
| @@ -410,16 +410,16 @@ | |
| 410 | } |
| 411 | } |
| 412 | db_finalize(&s); |
| 413 | manifest_crosslink_end(); |
| 414 | rebuild_tag_trunk(); |
| 415 | if( ttyOutput && !g.fQuiet && totalSize>0 ){ |
| 416 | processCnt += incrSize; |
| 417 | percent_complete((processCnt*1000)/totalSize); |
| 418 | } |
| 419 | if( doClustering ) create_cluster(); |
| 420 | if( ttyOutput && !g.fQuiet && totalSize>0 ){ |
| 421 | processCnt += incrSize; |
| 422 | percent_complete((processCnt*1000)/totalSize); |
| 423 | } |
| 424 | if(!g.fQuiet && ttyOutput ){ |
| 425 | fossil_print("\n"); |
| 426 |