Fossil SCM

Fix an extra call to db_end_transaction() in "fossil config pull ticket".

drh 2018-06-25 18:43 trunk
Commit f5eb03f5e585cdd5678888f4479178ef6f901e022aa82f9176df69817389f2e7
Parent 0b6d3eaf6cc3e22…
2 files changed +11 -10 +1 -1
~ src/configure.c ~ src/tkt.c
M src/configure.c
+11 -10
--- src/configure.c
+++ src/configure.c
@@ -36,11 +36,11 @@
3636
 #define CONFIGSET_SHUN 0x000010 /* Shun settings */
3737
 #define CONFIGSET_USER 0x000020 /* The USER table */
3838
 #define CONFIGSET_ADDR 0x000040 /* The CONCEALED table */
3939
 #define CONFIGSET_XFER 0x000080 /* Transfer configuration */
4040
 #define CONFIGSET_ALIAS 0x000100 /* URL Aliases */
41
-#define CONFIGSET_ALERT 0x000200 /* Email alerts */
41
+#define CONFIGSET_SCRIBERS 0x000200 /* Email subscribers */
4242
 #define CONFIGSET_FORUM 0x000400 /* Forum posts */
4343
4444
 #define CONFIGSET_ALL 0x0007ff /* Everything */
4545
4646
 #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
@@ -70,12 +70,12 @@
7070
 { "/shun", CONFIGSET_SHUN, "List of shunned artifacts" },
7171
 { "/ticket", CONFIGSET_TKT, "Ticket setup", },
7272
 { "/user", CONFIGSET_USER, "Users and privilege settings" },
7373
 { "/xfer", CONFIGSET_XFER, "Transfer setup", },
7474
 { "/alias", CONFIGSET_ALIAS, "URL Aliases", },
75
- { "/alert", CONFIGSET_ALERT, "Notification sent by email", },
76
- { "/forum", CONFIGSET_FORUM, "Forum posts", },
75
+ { "/subscribers", CONFIGSET_SCRIBERS,"Email notification subscriber list" },
76
+/* { "/forum", CONFIGSET_FORUM, "Forum posts", }, */
7777
 { "/all", CONFIGSET_ALL, "All of the above" },
7878
 };
7979
8080
8181
 /*
@@ -161,11 +161,11 @@
161161
162162
 { "@shun", CONFIGSET_SHUN },
163163
164164
 { "@alias", CONFIGSET_ALIAS },
165165
166
- { "@subscriber", CONFIGSET_ALERT },
166
+ { "@subscriber", CONFIGSET_SCRIBERS },
167167
168168
 { "xfer-common-script", CONFIGSET_XFER },
169169
 { "xfer-push-script", CONFIGSET_XFER },
170170
 { "xfer-commit-script", CONFIGSET_XFER },
171171
 { "xfer-ticket-script", CONFIGSET_XFER },
@@ -235,11 +235,11 @@
235235
 }
236236
 for(i=0; i<count(aConfig); i++){
237237
 if( strncmp(zName, aConfig[i].zName, n)==0 && aConfig[i].zName[n]==0 ){
238238
 int m = aConfig[i].groupMask;
239239
 if( !g.perm.Admin ){
240
- m &= ~(CONFIGSET_USER|CONFIGSET_ALERT);
240
+ m &= ~(CONFIGSET_USER|CONFIGSET_SCRIBERS);
241241
 }
242242
 if( !g.perm.RdForum ){
243243
 m &= ~(CONFIGSET_FORUM);
244244
 }
245245
 if( !g.perm.RdAddr ){
@@ -324,11 +324,11 @@
324324
 ** NEW FORMAT:
325325
 **
326326
 ** zName is one of:
327327
 **
328328
 ** "/config", "/user", "/shun", "/reportfmt", "/concealed",
329
-** "/alert", "/forum"
329
+** "/subscriber",
330330
 **
331331
 ** zName indicates the table that holds the configuration information being
332332
 ** transferred. pContent is a string that consist of alternating Fossil
333333
 ** and SQL tokens. The First token is a timestamp in seconds since 1970.
334334
 ** The second token is a primary key for the table identified by zName. If
@@ -350,11 +350,11 @@
350350
 ** /subscriber $SMTIME $SEMAIL suname $V ...
351351
 */
352352
 void configure_receive(const char *zName, Blob *pContent, int groupMask){
353353
 int checkMask; /* Masks for which we must first check existance of tables */
354354
355
- checkMask = CONFIGSET_ALERT;
355
+ checkMask = CONFIGSET_SCRIBERS;
356356
 if( zName[0]=='/' ){
357357
 /* The new format */
358358
 char *azToken[24];
359359
 int nToken = 0;
360360
 int ii, jj;
@@ -403,11 +403,11 @@
403403
 }else{
404404
 thisMask = configure_is_exportable(aType[ii].zName);
405405
 }
406406
 if( (thisMask & groupMask)==0 ) return;
407407
 if( (thisMask & checkMask)!=0 ){
408
- if( (thisMask & CONFIGSET_ALERT)!=0 ){
408
+ if( (thisMask & CONFIGSET_SCRIBERS)!=0 ){
409409
 email_schema(1);
410410
 }
411411
 checkMask &= ~thisMask;
412412
 }
413413
@@ -585,11 +585,11 @@
585585
 nCard++;
586586
 blob_reset(&rec);
587587
 }
588588
 db_finalize(&q);
589589
 }
590
- if( (groupMask & CONFIGSET_ALERT)!=0
590
+ if( (groupMask & CONFIGSET_SCRIBERS)!=0
591591
 && db_table_exists("repository","subscriber")
592592
 ){
593593
 db_prepare(&q, "SELECT mtime, quote(semail),"
594594
 " quote(suname), quote(sdigest),"
595595
 " quote(sdonotcall), quote(ssub),"
@@ -652,11 +652,12 @@
652652
 }
653653
 }
654654
 if( notFoundIsFatal ){
655655
 fossil_print("Available configuration areas:\n");
656656
 for(i=0; i<count(aGroupName); i++){
657
- fossil_print(" %-10s %s\n", &aGroupName[i].zName[1], aGroupName[i].zHelp);
657
+ fossil_print(" %-13s %s\n",
658
+ &aGroupName[i].zName[1], aGroupName[i].zHelp);
658659
 }
659660
 fossil_fatal("no such configuration area: \"%s\"", z);
660661
 }
661662
 return 0;
662663
 }
663664
--- src/configure.c
+++ src/configure.c
@@ -36,11 +36,11 @@
36 #define CONFIGSET_SHUN 0x000010 /* Shun settings */
37 #define CONFIGSET_USER 0x000020 /* The USER table */
38 #define CONFIGSET_ADDR 0x000040 /* The CONCEALED table */
39 #define CONFIGSET_XFER 0x000080 /* Transfer configuration */
40 #define CONFIGSET_ALIAS 0x000100 /* URL Aliases */
41 #define CONFIGSET_ALERT 0x000200 /* Email alerts */
42 #define CONFIGSET_FORUM 0x000400 /* Forum posts */
43
44 #define CONFIGSET_ALL 0x0007ff /* Everything */
45
46 #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
@@ -70,12 +70,12 @@
70 { "/shun", CONFIGSET_SHUN, "List of shunned artifacts" },
71 { "/ticket", CONFIGSET_TKT, "Ticket setup", },
72 { "/user", CONFIGSET_USER, "Users and privilege settings" },
73 { "/xfer", CONFIGSET_XFER, "Transfer setup", },
74 { "/alias", CONFIGSET_ALIAS, "URL Aliases", },
75 { "/alert", CONFIGSET_ALERT, "Notification sent by email", },
76 { "/forum", CONFIGSET_FORUM, "Forum posts", },
77 { "/all", CONFIGSET_ALL, "All of the above" },
78 };
79
80
81 /*
@@ -161,11 +161,11 @@
161
162 { "@shun", CONFIGSET_SHUN },
163
164 { "@alias", CONFIGSET_ALIAS },
165
166 { "@subscriber", CONFIGSET_ALERT },
167
168 { "xfer-common-script", CONFIGSET_XFER },
169 { "xfer-push-script", CONFIGSET_XFER },
170 { "xfer-commit-script", CONFIGSET_XFER },
171 { "xfer-ticket-script", CONFIGSET_XFER },
@@ -235,11 +235,11 @@
235 }
236 for(i=0; i<count(aConfig); i++){
237 if( strncmp(zName, aConfig[i].zName, n)==0 && aConfig[i].zName[n]==0 ){
238 int m = aConfig[i].groupMask;
239 if( !g.perm.Admin ){
240 m &= ~(CONFIGSET_USER|CONFIGSET_ALERT);
241 }
242 if( !g.perm.RdForum ){
243 m &= ~(CONFIGSET_FORUM);
244 }
245 if( !g.perm.RdAddr ){
@@ -324,11 +324,11 @@
324 ** NEW FORMAT:
325 **
326 ** zName is one of:
327 **
328 ** "/config", "/user", "/shun", "/reportfmt", "/concealed",
329 ** "/alert", "/forum"
330 **
331 ** zName indicates the table that holds the configuration information being
332 ** transferred. pContent is a string that consist of alternating Fossil
333 ** and SQL tokens. The First token is a timestamp in seconds since 1970.
334 ** The second token is a primary key for the table identified by zName. If
@@ -350,11 +350,11 @@
350 ** /subscriber $SMTIME $SEMAIL suname $V ...
351 */
352 void configure_receive(const char *zName, Blob *pContent, int groupMask){
353 int checkMask; /* Masks for which we must first check existance of tables */
354
355 checkMask = CONFIGSET_ALERT;
356 if( zName[0]=='/' ){
357 /* The new format */
358 char *azToken[24];
359 int nToken = 0;
360 int ii, jj;
@@ -403,11 +403,11 @@
403 }else{
404 thisMask = configure_is_exportable(aType[ii].zName);
405 }
406 if( (thisMask & groupMask)==0 ) return;
407 if( (thisMask & checkMask)!=0 ){
408 if( (thisMask & CONFIGSET_ALERT)!=0 ){
409 email_schema(1);
410 }
411 checkMask &= ~thisMask;
412 }
413
@@ -585,11 +585,11 @@
585 nCard++;
586 blob_reset(&rec);
587 }
588 db_finalize(&q);
589 }
590 if( (groupMask & CONFIGSET_ALERT)!=0
591 && db_table_exists("repository","subscriber")
592 ){
593 db_prepare(&q, "SELECT mtime, quote(semail),"
594 " quote(suname), quote(sdigest),"
595 " quote(sdonotcall), quote(ssub),"
@@ -652,11 +652,12 @@
652 }
653 }
654 if( notFoundIsFatal ){
655 fossil_print("Available configuration areas:\n");
656 for(i=0; i<count(aGroupName); i++){
657 fossil_print(" %-10s %s\n", &aGroupName[i].zName[1], aGroupName[i].zHelp);
 
658 }
659 fossil_fatal("no such configuration area: \"%s\"", z);
660 }
661 return 0;
662 }
663
--- src/configure.c
+++ src/configure.c
@@ -36,11 +36,11 @@
36 #define CONFIGSET_SHUN 0x000010 /* Shun settings */
37 #define CONFIGSET_USER 0x000020 /* The USER table */
38 #define CONFIGSET_ADDR 0x000040 /* The CONCEALED table */
39 #define CONFIGSET_XFER 0x000080 /* Transfer configuration */
40 #define CONFIGSET_ALIAS 0x000100 /* URL Aliases */
41 #define CONFIGSET_SCRIBERS 0x000200 /* Email subscribers */
42 #define CONFIGSET_FORUM 0x000400 /* Forum posts */
43
44 #define CONFIGSET_ALL 0x0007ff /* Everything */
45
46 #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
@@ -70,12 +70,12 @@
70 { "/shun", CONFIGSET_SHUN, "List of shunned artifacts" },
71 { "/ticket", CONFIGSET_TKT, "Ticket setup", },
72 { "/user", CONFIGSET_USER, "Users and privilege settings" },
73 { "/xfer", CONFIGSET_XFER, "Transfer setup", },
74 { "/alias", CONFIGSET_ALIAS, "URL Aliases", },
75 { "/subscribers", CONFIGSET_SCRIBERS,"Email notification subscriber list" },
76 /* { "/forum", CONFIGSET_FORUM, "Forum posts", }, */
77 { "/all", CONFIGSET_ALL, "All of the above" },
78 };
79
80
81 /*
@@ -161,11 +161,11 @@
161
162 { "@shun", CONFIGSET_SHUN },
163
164 { "@alias", CONFIGSET_ALIAS },
165
166 { "@subscriber", CONFIGSET_SCRIBERS },
167
168 { "xfer-common-script", CONFIGSET_XFER },
169 { "xfer-push-script", CONFIGSET_XFER },
170 { "xfer-commit-script", CONFIGSET_XFER },
171 { "xfer-ticket-script", CONFIGSET_XFER },
@@ -235,11 +235,11 @@
235 }
236 for(i=0; i<count(aConfig); i++){
237 if( strncmp(zName, aConfig[i].zName, n)==0 && aConfig[i].zName[n]==0 ){
238 int m = aConfig[i].groupMask;
239 if( !g.perm.Admin ){
240 m &= ~(CONFIGSET_USER|CONFIGSET_SCRIBERS);
241 }
242 if( !g.perm.RdForum ){
243 m &= ~(CONFIGSET_FORUM);
244 }
245 if( !g.perm.RdAddr ){
@@ -324,11 +324,11 @@
324 ** NEW FORMAT:
325 **
326 ** zName is one of:
327 **
328 ** "/config", "/user", "/shun", "/reportfmt", "/concealed",
329 ** "/subscriber",
330 **
331 ** zName indicates the table that holds the configuration information being
332 ** transferred. pContent is a string that consist of alternating Fossil
333 ** and SQL tokens. The First token is a timestamp in seconds since 1970.
334 ** The second token is a primary key for the table identified by zName. If
@@ -350,11 +350,11 @@
350 ** /subscriber $SMTIME $SEMAIL suname $V ...
351 */
352 void configure_receive(const char *zName, Blob *pContent, int groupMask){
353 int checkMask; /* Masks for which we must first check existance of tables */
354
355 checkMask = CONFIGSET_SCRIBERS;
356 if( zName[0]=='/' ){
357 /* The new format */
358 char *azToken[24];
359 int nToken = 0;
360 int ii, jj;
@@ -403,11 +403,11 @@
403 }else{
404 thisMask = configure_is_exportable(aType[ii].zName);
405 }
406 if( (thisMask & groupMask)==0 ) return;
407 if( (thisMask & checkMask)!=0 ){
408 if( (thisMask & CONFIGSET_SCRIBERS)!=0 ){
409 email_schema(1);
410 }
411 checkMask &= ~thisMask;
412 }
413
@@ -585,11 +585,11 @@
585 nCard++;
586 blob_reset(&rec);
587 }
588 db_finalize(&q);
589 }
590 if( (groupMask & CONFIGSET_SCRIBERS)!=0
591 && db_table_exists("repository","subscriber")
592 ){
593 db_prepare(&q, "SELECT mtime, quote(semail),"
594 " quote(suname), quote(sdigest),"
595 " quote(sdonotcall), quote(ssub),"
@@ -652,11 +652,12 @@
652 }
653 }
654 if( notFoundIsFatal ){
655 fossil_print("Available configuration areas:\n");
656 for(i=0; i<count(aGroupName); i++){
657 fossil_print(" %-13s %s\n",
658 &aGroupName[i].zName[1], aGroupName[i].zHelp);
659 }
660 fossil_fatal("no such configuration area: \"%s\"", z);
661 }
662 return 0;
663 }
664
M src/tkt.c
+1 -1
--- src/tkt.c
+++ src/tkt.c
@@ -372,11 +372,11 @@
372372
 "DROP TABLE IF EXISTS ticket;"
373373
 "DROP TABLE IF EXISTS ticketchng;"
374374
 );
375375
 zSql = ticket_table_schema();
376376
 if( separateConnection ){
377
- db_end_transaction(0);
377
+ if( db_transaction_nesting_depth() ) db_end_transaction(0);
378378
 db_init_database(g.zRepositoryName, zSql, 0);
379379
 }else{
380380
 db_multi_exec("%s", zSql/*safe-for-%s*/);
381381
 }
382382
 }
383383
--- src/tkt.c
+++ src/tkt.c
@@ -372,11 +372,11 @@
372 "DROP TABLE IF EXISTS ticket;"
373 "DROP TABLE IF EXISTS ticketchng;"
374 );
375 zSql = ticket_table_schema();
376 if( separateConnection ){
377 db_end_transaction(0);
378 db_init_database(g.zRepositoryName, zSql, 0);
379 }else{
380 db_multi_exec("%s", zSql/*safe-for-%s*/);
381 }
382 }
383
--- src/tkt.c
+++ src/tkt.c
@@ -372,11 +372,11 @@
372 "DROP TABLE IF EXISTS ticket;"
373 "DROP TABLE IF EXISTS ticketchng;"
374 );
375 zSql = ticket_table_schema();
376 if( separateConnection ){
377 if( db_transaction_nesting_depth() ) db_end_transaction(0);
378 db_init_database(g.zRepositoryName, zSql, 0);
379 }else{
380 db_multi_exec("%s", zSql/*safe-for-%s*/);
381 }
382 }
383

Keyboard Shortcuts

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