Fossil SCM
Get the "fossil scrub --private" command working again.
Commit
60acc2de34a2ef7f9681561b1b598673609cccfc
Parent
8031947e594396a…
2 files changed
+1
+2
M
src/db.c
+1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -882,10 +882,11 @@ | ||
| 882 | 882 | lsize = file_size(zDbName); |
| 883 | 883 | if( lsize%1024!=0 || lsize<4096 ) return 0; |
| 884 | 884 | db_open_or_attach(zDbName, "localdb", 0); |
| 885 | 885 | zVFileDef = db_text(0, "SELECT sql FROM %s.sqlite_master" |
| 886 | 886 | " WHERE name=='vfile'", db_name("localdb")); |
| 887 | + if( zVFileDef==0 ) return 0; | |
| 887 | 888 | |
| 888 | 889 | /* If the "isexe" column is missing from the vfile table, then |
| 889 | 890 | ** add it now. This code added on 2010-03-06. After all users have |
| 890 | 891 | ** upgraded, this code can be safely deleted. |
| 891 | 892 | */ |
| 892 | 893 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -882,10 +882,11 @@ | |
| 882 | lsize = file_size(zDbName); |
| 883 | if( lsize%1024!=0 || lsize<4096 ) return 0; |
| 884 | db_open_or_attach(zDbName, "localdb", 0); |
| 885 | zVFileDef = db_text(0, "SELECT sql FROM %s.sqlite_master" |
| 886 | " WHERE name=='vfile'", db_name("localdb")); |
| 887 | |
| 888 | /* If the "isexe" column is missing from the vfile table, then |
| 889 | ** add it now. This code added on 2010-03-06. After all users have |
| 890 | ** upgraded, this code can be safely deleted. |
| 891 | */ |
| 892 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -882,10 +882,11 @@ | |
| 882 | lsize = file_size(zDbName); |
| 883 | if( lsize%1024!=0 || lsize<4096 ) return 0; |
| 884 | db_open_or_attach(zDbName, "localdb", 0); |
| 885 | zVFileDef = db_text(0, "SELECT sql FROM %s.sqlite_master" |
| 886 | " WHERE name=='vfile'", db_name("localdb")); |
| 887 | if( zVFileDef==0 ) return 0; |
| 888 | |
| 889 | /* If the "isexe" column is missing from the vfile table, then |
| 890 | ** add it now. This code added on 2010-03-06. After all users have |
| 891 | ** upgraded, this code can be safely deleted. |
| 892 | */ |
| 893 |
+2
| --- src/rebuild.c | ||
| +++ src/rebuild.c | ||
| @@ -785,10 +785,12 @@ | ||
| 785 | 785 | int bVerily = find_option("verily",0,0)!=0; |
| 786 | 786 | int bForce = find_option("force", "f", 0)!=0; |
| 787 | 787 | int privateOnly = find_option("private",0,0)!=0; |
| 788 | 788 | int bNeedRebuild = 0; |
| 789 | 789 | db_find_and_open_repository(OPEN_ANY_SCHEMA, 2); |
| 790 | + db_close(1); | |
| 791 | + db_open_repository(g.zRepositoryName); | |
| 790 | 792 | if( !bForce ){ |
| 791 | 793 | Blob ans; |
| 792 | 794 | char cReply; |
| 793 | 795 | blob_zero(&ans); |
| 794 | 796 | prompt_user( |
| 795 | 797 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -785,10 +785,12 @@ | |
| 785 | int bVerily = find_option("verily",0,0)!=0; |
| 786 | int bForce = find_option("force", "f", 0)!=0; |
| 787 | int privateOnly = find_option("private",0,0)!=0; |
| 788 | int bNeedRebuild = 0; |
| 789 | db_find_and_open_repository(OPEN_ANY_SCHEMA, 2); |
| 790 | if( !bForce ){ |
| 791 | Blob ans; |
| 792 | char cReply; |
| 793 | blob_zero(&ans); |
| 794 | prompt_user( |
| 795 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -785,10 +785,12 @@ | |
| 785 | int bVerily = find_option("verily",0,0)!=0; |
| 786 | int bForce = find_option("force", "f", 0)!=0; |
| 787 | int privateOnly = find_option("private",0,0)!=0; |
| 788 | int bNeedRebuild = 0; |
| 789 | db_find_and_open_repository(OPEN_ANY_SCHEMA, 2); |
| 790 | db_close(1); |
| 791 | db_open_repository(g.zRepositoryName); |
| 792 | if( !bForce ){ |
| 793 | Blob ans; |
| 794 | char cReply; |
| 795 | blob_zero(&ans); |
| 796 | prompt_user( |
| 797 |