Fossil SCM
Disable the database file alias warnings on Mac due to Time-Machine issues.
Commit
14b1e90f21ed08959bfcc71a8415496efeafffa6
Parent
b894afad3dd18cd…
1 file changed
+6
+6
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -495,19 +495,25 @@ | ||
| 495 | 495 | case SQLITE_MISUSE: return "SQLITE_MISUSE"; |
| 496 | 496 | case SQLITE_NOLFS: return "SQLITE_NOLFS"; |
| 497 | 497 | case SQLITE_FORMAT: return "SQLITE_FORMAT"; |
| 498 | 498 | case SQLITE_RANGE: return "SQLITE_RANGE"; |
| 499 | 499 | case SQLITE_NOTADB: return "SQLITE_NOTADB"; |
| 500 | + case SQLITE_WARNING: return "SQLITE_WARNING"; | |
| 500 | 501 | default: { |
| 501 | 502 | sqlite3_snprintf(sizeof(zCode),zCode,"error code %d",iCode); |
| 502 | 503 | } |
| 503 | 504 | } |
| 504 | 505 | return zCode; |
| 505 | 506 | } |
| 506 | 507 | |
| 507 | 508 | /* Error logs from SQLite */ |
| 508 | 509 | static void fossil_sqlite_log(void *notUsed, int iCode, const char *zErrmsg){ |
| 510 | +#ifdef __APPLE__ | |
| 511 | + /* Disable the file alias warning on apple products because Time Machine | |
| 512 | + ** creates lots of aliases and the warning alarms people. */ | |
| 513 | + if( iCode==SQLITE_WARNING ) return; | |
| 514 | +#endif | |
| 509 | 515 | fossil_warning("%s: %s", sqlite_error_code_name(iCode), zErrmsg); |
| 510 | 516 | } |
| 511 | 517 | |
| 512 | 518 | /* |
| 513 | 519 | ** This procedure runs first. |
| 514 | 520 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -495,19 +495,25 @@ | |
| 495 | case SQLITE_MISUSE: return "SQLITE_MISUSE"; |
| 496 | case SQLITE_NOLFS: return "SQLITE_NOLFS"; |
| 497 | case SQLITE_FORMAT: return "SQLITE_FORMAT"; |
| 498 | case SQLITE_RANGE: return "SQLITE_RANGE"; |
| 499 | case SQLITE_NOTADB: return "SQLITE_NOTADB"; |
| 500 | default: { |
| 501 | sqlite3_snprintf(sizeof(zCode),zCode,"error code %d",iCode); |
| 502 | } |
| 503 | } |
| 504 | return zCode; |
| 505 | } |
| 506 | |
| 507 | /* Error logs from SQLite */ |
| 508 | static void fossil_sqlite_log(void *notUsed, int iCode, const char *zErrmsg){ |
| 509 | fossil_warning("%s: %s", sqlite_error_code_name(iCode), zErrmsg); |
| 510 | } |
| 511 | |
| 512 | /* |
| 513 | ** This procedure runs first. |
| 514 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -495,19 +495,25 @@ | |
| 495 | case SQLITE_MISUSE: return "SQLITE_MISUSE"; |
| 496 | case SQLITE_NOLFS: return "SQLITE_NOLFS"; |
| 497 | case SQLITE_FORMAT: return "SQLITE_FORMAT"; |
| 498 | case SQLITE_RANGE: return "SQLITE_RANGE"; |
| 499 | case SQLITE_NOTADB: return "SQLITE_NOTADB"; |
| 500 | case SQLITE_WARNING: return "SQLITE_WARNING"; |
| 501 | default: { |
| 502 | sqlite3_snprintf(sizeof(zCode),zCode,"error code %d",iCode); |
| 503 | } |
| 504 | } |
| 505 | return zCode; |
| 506 | } |
| 507 | |
| 508 | /* Error logs from SQLite */ |
| 509 | static void fossil_sqlite_log(void *notUsed, int iCode, const char *zErrmsg){ |
| 510 | #ifdef __APPLE__ |
| 511 | /* Disable the file alias warning on apple products because Time Machine |
| 512 | ** creates lots of aliases and the warning alarms people. */ |
| 513 | if( iCode==SQLITE_WARNING ) return; |
| 514 | #endif |
| 515 | fossil_warning("%s: %s", sqlite_error_code_name(iCode), zErrmsg); |
| 516 | } |
| 517 | |
| 518 | /* |
| 519 | ** This procedure runs first. |
| 520 |