Fossil SCM
Further simplification of db_get_manifest_setting(): No need to check in global_config because manifest cannot be set globally.
Commit
b89520f2276b00d42c58400e994b209c48f022b5414806598d0a3d8f579c1c2c
Parent
ed6b0c0b5c65c8d…
1 file changed
-7
M
src/db.c
-7
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -4088,17 +4088,10 @@ | ||
| 4088 | 4088 | zVal = db_get_versioned("manifest", 0, zCkin); |
| 4089 | 4089 | |
| 4090 | 4090 | if( zVal==0 && g.repositoryOpen ){ |
| 4091 | 4091 | /* No versioned setting, look for the repository setting second */ |
| 4092 | 4092 | zVal = db_text(0, "SELECT value FROM config WHERE name='manifest'"); |
| 4093 | - if( zVal==0 && g.zConfigDbName ){ | |
| 4094 | - /* No repository setting either, look for a global setting */ | |
| 4095 | - db_swap_connections(); | |
| 4096 | - zVal = db_text(0, | |
| 4097 | - "SELECT value FROM global_config WHERE name='manifest'"); | |
| 4098 | - db_swap_connections(); | |
| 4099 | - } | |
| 4100 | 4093 | } |
| 4101 | 4094 | if( zVal==0 || is_false(zVal) ){ |
| 4102 | 4095 | return 0; |
| 4103 | 4096 | }else if( is_truth(zVal) ){ |
| 4104 | 4097 | return MFESTFLG_RAW|MFESTFLG_UUID; |
| 4105 | 4098 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4088,17 +4088,10 @@ | |
| 4088 | zVal = db_get_versioned("manifest", 0, zCkin); |
| 4089 | |
| 4090 | if( zVal==0 && g.repositoryOpen ){ |
| 4091 | /* No versioned setting, look for the repository setting second */ |
| 4092 | zVal = db_text(0, "SELECT value FROM config WHERE name='manifest'"); |
| 4093 | if( zVal==0 && g.zConfigDbName ){ |
| 4094 | /* No repository setting either, look for a global setting */ |
| 4095 | db_swap_connections(); |
| 4096 | zVal = db_text(0, |
| 4097 | "SELECT value FROM global_config WHERE name='manifest'"); |
| 4098 | db_swap_connections(); |
| 4099 | } |
| 4100 | } |
| 4101 | if( zVal==0 || is_false(zVal) ){ |
| 4102 | return 0; |
| 4103 | }else if( is_truth(zVal) ){ |
| 4104 | return MFESTFLG_RAW|MFESTFLG_UUID; |
| 4105 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4088,17 +4088,10 @@ | |
| 4088 | zVal = db_get_versioned("manifest", 0, zCkin); |
| 4089 | |
| 4090 | if( zVal==0 && g.repositoryOpen ){ |
| 4091 | /* No versioned setting, look for the repository setting second */ |
| 4092 | zVal = db_text(0, "SELECT value FROM config WHERE name='manifest'"); |
| 4093 | } |
| 4094 | if( zVal==0 || is_false(zVal) ){ |
| 4095 | return 0; |
| 4096 | }else if( is_truth(zVal) ){ |
| 4097 | return MFESTFLG_RAW|MFESTFLG_UUID; |
| 4098 |