Fossil SCM
Attempt to squelch stdout errors from manifest parsing when it encounters a non-manifest. Reported at [forum:/forumpost/d6a8e3b2a843c498 | forum post d6a8e3b2a843c498].
Commit
65dbc19eaefefa98b6532986f45ed5f843d00d36e8ac92a5e281a0200826c2d9
Parent
ebcad739e82d2a6…
1 file changed
+3
-1
+3
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -501,11 +501,13 @@ | ||
| 501 | 501 | /* Verify that the first few characters of the artifact look like |
| 502 | 502 | ** a control artifact. |
| 503 | 503 | */ |
| 504 | 504 | if( n<10 || z[0]<'A' || z[0]>'Z' || z[1]!=' ' ){ |
| 505 | 505 | blob_reset(pContent); |
| 506 | - blob_appendf(pErr, "line 1 not recognized"); | |
| 506 | + if(pErr!=0){ | |
| 507 | + blob_appendf(pErr, "line 1 not recognized"); | |
| 508 | + } | |
| 507 | 509 | return 0; |
| 508 | 510 | } |
| 509 | 511 | /* Then verify the Z-card. |
| 510 | 512 | */ |
| 511 | 513 | #if 1 |
| 512 | 514 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -501,11 +501,13 @@ | |
| 501 | /* Verify that the first few characters of the artifact look like |
| 502 | ** a control artifact. |
| 503 | */ |
| 504 | if( n<10 || z[0]<'A' || z[0]>'Z' || z[1]!=' ' ){ |
| 505 | blob_reset(pContent); |
| 506 | blob_appendf(pErr, "line 1 not recognized"); |
| 507 | return 0; |
| 508 | } |
| 509 | /* Then verify the Z-card. |
| 510 | */ |
| 511 | #if 1 |
| 512 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -501,11 +501,13 @@ | |
| 501 | /* Verify that the first few characters of the artifact look like |
| 502 | ** a control artifact. |
| 503 | */ |
| 504 | if( n<10 || z[0]<'A' || z[0]>'Z' || z[1]!=' ' ){ |
| 505 | blob_reset(pContent); |
| 506 | if(pErr!=0){ |
| 507 | blob_appendf(pErr, "line 1 not recognized"); |
| 508 | } |
| 509 | return 0; |
| 510 | } |
| 511 | /* Then verify the Z-card. |
| 512 | */ |
| 513 | #if 1 |
| 514 |