c962de3 Rename SIGNATURE to SIGNATURE_TYPE to match MIRROR_TYPE convention — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Rename SIGNATURE to SIGNATURE_TYPE to match MIRROR_TYPE convention

Bryan Drewery committed 12 years ago

commit c962de32b90c9d3c24c6a133be39bf7a7f13a51d
parent dd55bc7

2 files changed +2 -2

modified libpkg/pkg_config.c

@@ -717,7 +717,7 @@ add_repo(ucl_object_t *obj, struct pkg_repo *r, const char *rname)

 				return;
 			}
 			mirror_type = ucl_obj_tostring(sub);
 		} else if (strcasecmp(sub->key, "signature") == 0) {
 		} else if (strcasecmp(sub->key, "signature_type") == 0) {
 			if (sub->type != UCL_STRING) {
 				pkg_emit_error("Expecting a string for the "
 				    "'%s' key of the '%s' repo",

modified pkg/main.c

@@ -447,7 +447,7 @@ show_repository_info(void)

 		    "    %-16s: %s,\n    %-16s: %s,\n    %-16s: %s\n  } \n",
 		    pkg_repo_ident(repo),
                     "url", pkg_repo_url(repo),
 		    "signature", sig,
 		    "signature_type", sig,
 		    "pubkey", pkg_repo_key(repo) == NULL ?
 		        "" : pkg_repo_key(repo),
 		    "fingerprints", pkg_repo_fingerprints(repo) == NULL ?