Fossil SCM
Backout check-in [fb04f278294a8ca6f] since it causes "fossil set" to fail.
Commit
bb3fe3997be9355a87016829890f9127e935e3da
Parent
74e3f90596ac555…
1 file changed
+1
-9
M
src/db.c
+1
-9
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -765,19 +765,11 @@ | ||
| 765 | 765 | ** case, invoke this routine with useAttach as 1. |
| 766 | 766 | */ |
| 767 | 767 | void db_open_config(int useAttach){ |
| 768 | 768 | char *zDbName; |
| 769 | 769 | const char *zHome; |
| 770 | - if( g.configOpen ){ | |
| 771 | - if( useAttach==g.useAttach ) return; | |
| 772 | - if( g.useAttach ){ | |
| 773 | - db_detach("configdb"); | |
| 774 | - }else if( g.dbConfig ){ | |
| 775 | - sqlite3_close(g.dbConfig); | |
| 776 | - g.dbConfig = 0; | |
| 777 | - } | |
| 778 | - } | |
| 770 | + if( g.configOpen ) return; | |
| 779 | 771 | #if defined(_WIN32) |
| 780 | 772 | zHome = fossil_getenv("LOCALAPPDATA"); |
| 781 | 773 | if( zHome==0 ){ |
| 782 | 774 | zHome = fossil_getenv("APPDATA"); |
| 783 | 775 | if( zHome==0 ){ |
| 784 | 776 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -765,19 +765,11 @@ | |
| 765 | ** case, invoke this routine with useAttach as 1. |
| 766 | */ |
| 767 | void db_open_config(int useAttach){ |
| 768 | char *zDbName; |
| 769 | const char *zHome; |
| 770 | if( g.configOpen ){ |
| 771 | if( useAttach==g.useAttach ) return; |
| 772 | if( g.useAttach ){ |
| 773 | db_detach("configdb"); |
| 774 | }else if( g.dbConfig ){ |
| 775 | sqlite3_close(g.dbConfig); |
| 776 | g.dbConfig = 0; |
| 777 | } |
| 778 | } |
| 779 | #if defined(_WIN32) |
| 780 | zHome = fossil_getenv("LOCALAPPDATA"); |
| 781 | if( zHome==0 ){ |
| 782 | zHome = fossil_getenv("APPDATA"); |
| 783 | if( zHome==0 ){ |
| 784 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -765,19 +765,11 @@ | |
| 765 | ** case, invoke this routine with useAttach as 1. |
| 766 | */ |
| 767 | void db_open_config(int useAttach){ |
| 768 | char *zDbName; |
| 769 | const char *zHome; |
| 770 | if( g.configOpen ) return; |
| 771 | #if defined(_WIN32) |
| 772 | zHome = fossil_getenv("LOCALAPPDATA"); |
| 773 | if( zHome==0 ){ |
| 774 | zHome = fossil_getenv("APPDATA"); |
| 775 | if( zHome==0 ){ |
| 776 |