From: drh <>
Date: Sat, 14 Sep 2024 11:38:46 +0000 (+0000)
Subject: Always show the -v traffic message even if there are multiple -v options.
X-Git-Tag: version-3.47.0~118^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df9b4887991e94a2414c3f0b5b4263801f22deed;p=thirdparty%2Fsqlite.git

Always show the -v traffic message even if there are multiple -v options.

FossilOrigin-Name: fc05a5b7f77cdbfcc659d49eb09569a64a172362cb90199e2861028085178f10
---

diff --git a/manifest b/manifest
index fc99c17e78..a69024423f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--logfile\sFILE\soption\sfor\sdebugging.
-D 2024-09-14T11:23:57.579
+C Always\sshow\sthe\s-v\straffic\smessage\seven\sif\sthere\sare\smultiple\s-v\soptions.
+D 2024-09-14T11:38:46.736
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2174,7 +2174,7 @@ F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
 F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d40618 x
 F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60
 F tool/sqldiff.c 847fc8fcfddf5ce4797b7394cad6372f2f5dc17d8186e2ef8fb44d50fae4f44a
-F tool/sqlite3-rsync.c 8cef3550aa9eb94e243c833c53e66cfe534e62d33e5490b2f884d4c73a184fb2
+F tool/sqlite3-rsync.c ac2160892a2baf0317d1232c4678db148b90285c422ca3bc3ec3a96194cf4129
 F tool/sqlite3_analyzer.c.in 8da2b08f56eeac331a715036cf707cc20f879f231362be0c22efd682e2b89b4f
 F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
@@ -2213,8 +2213,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 452fb6de3984c3cb10d30b51dcdb2574578ca128a0c519b2bd43df0bdd343083
-R a57a86421474386b5ed9caf031db8013
+P 30e1b92d5663e24d2f325f2bab35f81b55848ef39d15688e40b9005269626303
+R 3a4c9e53edbc74f8aebbd484815d1c77
 U drh
-Z 4ff8584d3a3a5f66a03fe1e9c7d688fd
+Z 7d402ed7dd081ccd3ef9c52fe661c558
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0c1a83e195..7ae6c7119a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-30e1b92d5663e24d2f325f2bab35f81b55848ef39d15688e40b9005269626303
+fc05a5b7f77cdbfcc659d49eb09569a64a172362cb90199e2861028085178f10
diff --git a/tool/sqlite3-rsync.c b/tool/sqlite3-rsync.c
index fd2cb068e6..47f34b5132 100644
--- a/tool/sqlite3-rsync.c
+++ b/tool/sqlite3-rsync.c
@@ -1733,7 +1733,7 @@ int main(int argc, char const * const *argv){
   if( ctx.nErr ){
     printf("Databases where not synced due to errors\n");
   }
-  if( ctx.eVerbose==1 ){
+  if( ctx.eVerbose>=1 ){
     char *zMsg;
     sqlite3_int64 szTotal = (sqlite3_int64)ctx.nPage*(sqlite3_int64)ctx.szPage;
     sqlite3_int64 nIO = ctx.nOut +ctx.nIn;