emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Preserve meta-index data on change of signing key"

Browse Source 
This reverts commit ae26a83ad2.
This commit is contained in:
Juan RP 2020-01-06 14:46:12 +01:00
parent 2884fc3ab7
commit 10b2f7b425
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/xbps-rindex/sign.c
View File

@ -196,6 +196,7 @@ sign_repo(struct xbps_handle *xhp, const char *repodir,
rv = EINVAL; rv = EINVAL;
goto out; goto out;
} }
meta = xbps_dictionary_create();
data = xbps_data_create_data(buf, strlen(buf)); data = xbps_data_create_data(buf, strlen(buf));
rpubkey = xbps_dictionary_get(repo->idxmeta, "public-key"); rpubkey = xbps_dictionary_get(repo->idxmeta, "public-key");
@ -216,10 +217,6 @@ sign_repo(struct xbps_handle *xhp, const char *repodir,
if (!flush) if (!flush)
goto out; goto out;
meta = xbps_dictionary_copy_mutable(repo->idxmeta);
if (meta == NULL) {
meta = xbps_dictionary_create();
}
xbps_dictionary_set(meta, "public-key", data); xbps_dictionary_set(meta, "public-key", data);
xbps_dictionary_set_uint16(meta, "public-key-size", pubkeysize); xbps_dictionary_set_uint16(meta, "public-key-size", pubkeysize);
xbps_dictionary_set_cstring_nocopy(meta, "signature-by", signedby); xbps_dictionary_set_cstring_nocopy(meta, "signature-by", signedby);