Fossil SCM
Draft fix for 'settings' command issue when using the '-R' option.
Commit
9807a05d8a815a3dc0be0957bedfc38328656922
Parent
d6cb724e653611f…
1 file changed
+4
-1
M
src/db.c
+4
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -3085,14 +3085,17 @@ | ||
| 3085 | 3085 | void setting_cmd(void){ |
| 3086 | 3086 | int i; |
| 3087 | 3087 | int globalFlag = find_option("global","g",0)!=0; |
| 3088 | 3088 | int exactFlag = find_option("exact",0,0)!=0; |
| 3089 | 3089 | int unsetFlag = g.argv[1][0]=='u'; |
| 3090 | - verify_all_options(); | |
| 3090 | + if( globalFlag ){ | |
| 3091 | + verify_all_options(); | |
| 3092 | + } | |
| 3091 | 3093 | db_open_config(1, 0); |
| 3092 | 3094 | if( !globalFlag ){ |
| 3093 | 3095 | db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0); |
| 3096 | + verify_all_options(); | |
| 3094 | 3097 | } |
| 3095 | 3098 | if( !g.repositoryOpen ){ |
| 3096 | 3099 | globalFlag = 1; |
| 3097 | 3100 | } |
| 3098 | 3101 | if( unsetFlag && g.argc!=3 ){ |
| 3099 | 3102 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3085,14 +3085,17 @@ | |
| 3085 | void setting_cmd(void){ |
| 3086 | int i; |
| 3087 | int globalFlag = find_option("global","g",0)!=0; |
| 3088 | int exactFlag = find_option("exact",0,0)!=0; |
| 3089 | int unsetFlag = g.argv[1][0]=='u'; |
| 3090 | verify_all_options(); |
| 3091 | db_open_config(1, 0); |
| 3092 | if( !globalFlag ){ |
| 3093 | db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0); |
| 3094 | } |
| 3095 | if( !g.repositoryOpen ){ |
| 3096 | globalFlag = 1; |
| 3097 | } |
| 3098 | if( unsetFlag && g.argc!=3 ){ |
| 3099 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3085,14 +3085,17 @@ | |
| 3085 | void setting_cmd(void){ |
| 3086 | int i; |
| 3087 | int globalFlag = find_option("global","g",0)!=0; |
| 3088 | int exactFlag = find_option("exact",0,0)!=0; |
| 3089 | int unsetFlag = g.argv[1][0]=='u'; |
| 3090 | if( globalFlag ){ |
| 3091 | verify_all_options(); |
| 3092 | } |
| 3093 | db_open_config(1, 0); |
| 3094 | if( !globalFlag ){ |
| 3095 | db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0); |
| 3096 | verify_all_options(); |
| 3097 | } |
| 3098 | if( !g.repositoryOpen ){ |
| 3099 | globalFlag = 1; |
| 3100 | } |
| 3101 | if( unsetFlag && g.argc!=3 ){ |
| 3102 |