Simplify rpmKeyringModify(RPMKEYRING_REPLACE)

Implement as RPMKEYRING_DELETE + RPMKEYRING_ADD. This will make it easier to handle the subkeys at the same time in the next commit. Related: 3350
rpm-software-management · Oct 24, 2024 · ad461ce · ad461ce
1 parent 09510e4
commit ad461ce
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/rpmio/rpmkeyring.cc b/rpmio/rpmkeyring.cc
@@ -133,15 +133,11 @@ int rpmKeyringModify(rpmKeyring keyring, rpmPubkey key, rpmKeyringModifyMode mod
 	if (item->second->fp == key->fp)
 	    break;
     }
-    if (item != range.second && mode == RPMKEYRING_DELETE) {
+    if (item != range.second && (mode == RPMKEYRING_DELETE || mode == RPMKEYRING_REPLACE)) {
 	rpmPubkeyFree(item->second);
 	keyring->keys.erase(item);
 	rc = 0;
-    } else if (item != range.second && mode == RPMKEYRING_REPLACE) {
-	rpmPubkeyFree(item->second);
-	item->second = rpmPubkeyLink(key);
-	rc = 0;
-    } else if (item == range.second && (mode == RPMKEYRING_ADD || mode == RPMKEYRING_REPLACE) ) {
+    } else if ((item == range.second && mode == RPMKEYRING_ADD) || mode == RPMKEYRING_REPLACE) {
 	keyring->keys.insert({key->keyid, rpmPubkeyLink(key)});
 	rc = 0;
     }