Mercurial > trustbridge
changeset 278:539c856cb5da
Ditched warning about no profiles for separate failed add/remove warnings.
| author | Sascha Wilde <wilde@intevation.de> |
|---|---|
| date | Wed, 02 Apr 2014 13:17:04 +0200 |
| parents | 22408d797c92 |
| children | cb5f082e90c5 |
| files | cinst/mozilla.c common/errorcodes.h |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/cinst/mozilla.c Wed Apr 02 13:10:40 2014 +0200 +++ b/cinst/mozilla.c Wed Apr 02 13:17:04 2014 +0200 @@ -270,7 +270,6 @@ if (inis == NULL) { DEBUGPRINTF("No ini files found - will do nothing!\n"); - exit(WARN_MOZ_NO_PROFILES); } return inis; } @@ -556,7 +555,7 @@ { puts(pdirs[i]); if (! remove_cert(pdirs[i], secitemp)) - return_code |= WARN_MOZ_COULD_NOT_ADD_OR_REMOVE_CERT; + return_code |= WARN_MOZ_COULD_NOT_REMOVE_CERT; puts("List of installed certs:"); nss_list_certs(pdirs[i]); } @@ -570,7 +569,7 @@ { puts(pdirs[i]); if (! import_cert(pdirs[i], secitemp)) - return_code |= WARN_MOZ_COULD_NOT_ADD_OR_REMOVE_CERT; + return_code |= WARN_MOZ_COULD_NOT_ADD_CERT; nss_list_certs(pdirs[i]); } free(secitemp->data);
--- a/common/errorcodes.h Wed Apr 02 13:10:40 2014 +0200 +++ b/common/errorcodes.h Wed Apr 02 13:17:04 2014 +0200 @@ -37,9 +37,9 @@ #define WARN_MOZ_FAILED_TO_OPEN_INI 0x0091 /* Warning: Some profile paths from profile.ini don't exist */ #define WARN_MOZ_PROFILE_DOES_NOT_EXIST 0x0092 -/* Warning: no profiles found */ -#define WARN_MOZ_NO_PROFILES 0x0094 -/* Warning: no profiles found */ -#define WARN_MOZ_COULD_NOT_ADD_OR_REMOVE_CERT 0x0098 +/* Warning: could not install some certs */ +#define WARN_MOZ_COULD_NOT_ADD_CERT 0x0094 +/* Warning: could not remove some certs */ +#define WARN_MOZ_COULD_NOT_REMOVE_CERT 0x0098 #endif