Fossil SCM

Fix to the new autopush privilege warning logic.

drh 2019-04-17 19:40 trunk
Commit 92406fa4454ffed0e93b782c4efae812013d7485ade052b80630ba2580575bff
1 file changed +1 -1
+1 -1
--- src/xfer.c
+++ src/xfer.c
@@ -2290,11 +2290,11 @@
22902290
** autopush following a commit.
22912291
*/
22922292
if( blob_eq(&xfer.aToken[0],"error") && xfer.nToken==2 ){
22932293
char *zMsg = blob_terminate(&xfer.aToken[1]);
22942294
defossilize(zMsg);
2295
- if( (syncFlags && SYNC_IFABLE)!=0
2295
+ if( (syncFlags & SYNC_IFABLE)!=0
22962296
&& sqlite3_strlike("%not authorized to write%",zMsg,0)==0 ){
22972297
autopushFailed = 1;
22982298
nErr++;
22992299
}else if( (syncFlags & SYNC_CLONE)==0 || nCycle>0 ){
23002300
fossil_force_newline();
23012301
--- src/xfer.c
+++ src/xfer.c
@@ -2290,11 +2290,11 @@
2290 ** autopush following a commit.
2291 */
2292 if( blob_eq(&xfer.aToken[0],"error") && xfer.nToken==2 ){
2293 char *zMsg = blob_terminate(&xfer.aToken[1]);
2294 defossilize(zMsg);
2295 if( (syncFlags && SYNC_IFABLE)!=0
2296 && sqlite3_strlike("%not authorized to write%",zMsg,0)==0 ){
2297 autopushFailed = 1;
2298 nErr++;
2299 }else if( (syncFlags & SYNC_CLONE)==0 || nCycle>0 ){
2300 fossil_force_newline();
2301
--- src/xfer.c
+++ src/xfer.c
@@ -2290,11 +2290,11 @@
2290 ** autopush following a commit.
2291 */
2292 if( blob_eq(&xfer.aToken[0],"error") && xfer.nToken==2 ){
2293 char *zMsg = blob_terminate(&xfer.aToken[1]);
2294 defossilize(zMsg);
2295 if( (syncFlags & SYNC_IFABLE)!=0
2296 && sqlite3_strlike("%not authorized to write%",zMsg,0)==0 ){
2297 autopushFailed = 1;
2298 nErr++;
2299 }else if( (syncFlags & SYNC_CLONE)==0 || nCycle>0 ){
2300 fossil_force_newline();
2301

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button