Fossil SCM
Improvement to the error message issued when the HOME environment variable is missing. Ticket [e3c34af10dd28]
Commit
e00a5de0f143bb7dad565e11f646f87bb1ae66b9
Parent
a2cbedcb1fee87d…
2 files changed
+1
-1
+7
-2
+1
-1
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -179,11 +179,11 @@ | ||
| 179 | 179 | compute_leaves(db_lget_int("checkout",0), 1); |
| 180 | 180 | zVers = db_text(0, "SELECT uuid FROM leaves, event, blob" |
| 181 | 181 | " WHERE event.objid=leaves.rid AND blob.rid=leaves.rid" |
| 182 | 182 | " ORDER BY event.mtime DESC"); |
| 183 | 183 | if( zVers==0 ){ |
| 184 | - fossil_fatal("cannot local \"latest\" checkout"); | |
| 184 | + fossil_fatal("cannot locate \"latest\" checkout"); | |
| 185 | 185 | } |
| 186 | 186 | }else{ |
| 187 | 187 | zVers = g.argv[2]; |
| 188 | 188 | } |
| 189 | 189 | vid = load_vfile(zVers); |
| 190 | 190 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | compute_leaves(db_lget_int("checkout",0), 1); |
| 180 | zVers = db_text(0, "SELECT uuid FROM leaves, event, blob" |
| 181 | " WHERE event.objid=leaves.rid AND blob.rid=leaves.rid" |
| 182 | " ORDER BY event.mtime DESC"); |
| 183 | if( zVers==0 ){ |
| 184 | fossil_fatal("cannot local \"latest\" checkout"); |
| 185 | } |
| 186 | }else{ |
| 187 | zVers = g.argv[2]; |
| 188 | } |
| 189 | vid = load_vfile(zVers); |
| 190 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | compute_leaves(db_lget_int("checkout",0), 1); |
| 180 | zVers = db_text(0, "SELECT uuid FROM leaves, event, blob" |
| 181 | " WHERE event.objid=leaves.rid AND blob.rid=leaves.rid" |
| 182 | " ORDER BY event.mtime DESC"); |
| 183 | if( zVers==0 ){ |
| 184 | fossil_fatal("cannot locate \"latest\" checkout"); |
| 185 | } |
| 186 | }else{ |
| 187 | zVers = g.argv[2]; |
| 188 | } |
| 189 | vid = load_vfile(zVers); |
| 190 |
M
src/db.c
+7
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -656,16 +656,21 @@ | ||
| 656 | 656 | zHome = getenv("APPDATA"); |
| 657 | 657 | if( zHome==0 ){ |
| 658 | 658 | zHome = getenv("HOMEPATH"); |
| 659 | 659 | } |
| 660 | 660 | } |
| 661 | + if( zHome==0 ){ | |
| 662 | + db_err("cannot locate home directory - " | |
| 663 | + "please set the HOMEPATH environment variable"); | |
| 664 | + } | |
| 661 | 665 | #else |
| 662 | 666 | zHome = getenv("HOME"); |
| 663 | -#endif | |
| 664 | 667 | if( zHome==0 ){ |
| 665 | - db_err("cannot locate home directory"); | |
| 668 | + db_err("cannot locate home directory - " | |
| 669 | + "please set the HOME environment variable"); | |
| 666 | 670 | } |
| 671 | +#endif | |
| 667 | 672 | #ifdef __MINGW32__ |
| 668 | 673 | /* . filenames give some window systems problems and many apps problems */ |
| 669 | 674 | zDbName = mprintf("%//_fossil", zHome); |
| 670 | 675 | #else |
| 671 | 676 | zDbName = mprintf("%s/.fossil", zHome); |
| 672 | 677 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -656,16 +656,21 @@ | |
| 656 | zHome = getenv("APPDATA"); |
| 657 | if( zHome==0 ){ |
| 658 | zHome = getenv("HOMEPATH"); |
| 659 | } |
| 660 | } |
| 661 | #else |
| 662 | zHome = getenv("HOME"); |
| 663 | #endif |
| 664 | if( zHome==0 ){ |
| 665 | db_err("cannot locate home directory"); |
| 666 | } |
| 667 | #ifdef __MINGW32__ |
| 668 | /* . filenames give some window systems problems and many apps problems */ |
| 669 | zDbName = mprintf("%//_fossil", zHome); |
| 670 | #else |
| 671 | zDbName = mprintf("%s/.fossil", zHome); |
| 672 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -656,16 +656,21 @@ | |
| 656 | zHome = getenv("APPDATA"); |
| 657 | if( zHome==0 ){ |
| 658 | zHome = getenv("HOMEPATH"); |
| 659 | } |
| 660 | } |
| 661 | if( zHome==0 ){ |
| 662 | db_err("cannot locate home directory - " |
| 663 | "please set the HOMEPATH environment variable"); |
| 664 | } |
| 665 | #else |
| 666 | zHome = getenv("HOME"); |
| 667 | if( zHome==0 ){ |
| 668 | db_err("cannot locate home directory - " |
| 669 | "please set the HOME environment variable"); |
| 670 | } |
| 671 | #endif |
| 672 | #ifdef __MINGW32__ |
| 673 | /* . filenames give some window systems problems and many apps problems */ |
| 674 | zDbName = mprintf("%//_fossil", zHome); |
| 675 | #else |
| 676 | zDbName = mprintf("%s/.fossil", zHome); |
| 677 |