summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2012-08-02 14:17:53 +0000
committerJason Woodward2012-08-02 14:21:05 +0000
commite48860e2d6e318a592b1d232711278f0a44cc698 (patch)
tree5dd687e6a4d139afcd819f8d9d88927b6a46e590
parentea329d741a16e11515e9936ca5adcea4a57028da (diff)
downloadslapt-get-e48860e2d6e318a592b1d232711278f0a44cc698.tar.gz
use SLAPT_CHECKSUMS_NOT_VERIFIED instead of SLAPT_CHECKSUMS_NOT_VERIFIED_UNKNOWN
-rw-r--r--src/common.c4
-rw-r--r--src/common.h2
-rw-r--r--src/gpgme.c2
-rw-r--r--src/package.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/common.c b/src/common.c
index 4bf71bc..b3f2c97 100644
--- a/src/common.c
+++ b/src/common.c
@@ -341,8 +341,8 @@ const char *slapt_strerror(slapt_code_t code)
return gettext("Not Verified: bad policy");
case SLAPT_CHECKSUMS_NOT_VERIFIED_GPGME_SYS_ERROR:
return gettext("Not Verified: system error");
- case SLAPT_CHECKSUMS_NOT_VERIFIED_UNKNOWN:
- return gettext("Not Verified: unknown error");
+ case SLAPT_CHECKSUMS_NOT_VERIFIED:
+ return gettext("Checksums signature could not be verified");
case SLAPT_CHECKSUMS_MISSING_KEY:
return gettext("No key for verification");
#endif
diff --git a/src/common.h b/src/common.h
index 37c36d4..c95c916 100644
--- a/src/common.h
+++ b/src/common.h
@@ -21,6 +21,7 @@ typedef enum {
SLAPT_GPG_KEY_UNCHANGED,
SLAPT_CHECKSUMS_VERIFIED,
SLAPT_CHECKSUMS_MISSING_KEY,
+ SLAPT_CHECKSUMS_NOT_VERIFIED,
SLAPT_CHECKSUMS_NOT_VERIFIED_NULL_CONTEXT,
SLAPT_CHECKSUMS_NOT_VERIFIED_READ_CHECKSUMS,
SLAPT_CHECKSUMS_NOT_VERIFIED_READ_SIGNATURE,
@@ -31,7 +32,6 @@ typedef enum {
SLAPT_CHECKSUMS_NOT_VERIFIED_GPGME_CRL_TOO_OLD,
SLAPT_CHECKSUMS_NOT_VERIFIED_GPGME_BAD_POLICY,
SLAPT_CHECKSUMS_NOT_VERIFIED_GPGME_SYS_ERROR,
- SLAPT_CHECKSUMS_NOT_VERIFIED_UNKNOWN,
#endif
SLAPT_DOWNLOAD_INCOMPLETE
} slapt_code_t;
diff --git a/src/gpgme.c b/src/gpgme.c
index f45b49f..44dc320 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -267,7 +267,7 @@ slapt_code_t slapt_gpg_verify_checksums(FILE *checksums,
gpgme_error_t e;
gpgme_ctx_t *ctx = _slapt_init_gpgme_ctx();
gpgme_data_t chk_data, asc_data;
- slapt_code_t verified = SLAPT_CHECKSUMS_NOT_VERIFIED_UNKNOWN;
+ slapt_code_t verified = SLAPT_CHECKSUMS_NOT_VERIFIED;
if (ctx == NULL)
return SLAPT_CHECKSUMS_NOT_VERIFIED_NULL_CONTEXT;
diff --git a/src/package.c b/src/package.c
index 919c1e9..f4c83fd 100644
--- a/src/package.c
+++ b/src/package.c
@@ -2020,7 +2020,7 @@ int slapt_update_pkg_cache(const slapt_rc_config *global_config)
}
if (tmp_signature_f != NULL && tmp_checksum_to_verify_f != NULL) {
- slapt_code_t verified = SLAPT_CHECKSUMS_NOT_VERIFIED_UNKNOWN;
+ slapt_code_t verified = SLAPT_CHECKSUMS_NOT_VERIFIED;
printf(gettext("Verifying checksum signature [%s]..."), source_url);
verified = slapt_gpg_verify_checksums(tmp_checksum_to_verify_f, tmp_signature_f);
if (verified == SLAPT_CHECKSUMS_VERIFIED) {