@ffesti commented on this pull request.


> @@ -159,9 +159,18 @@ static int addTE(rpmte p, Header h, fnpyKey key, 
> rpmRelocation * relocs)
     p->arch = headerGetAsString(h, RPMTAG_ARCH);
     p->os = headerGetAsString(h, RPMTAG_OS);
 
-    /* gpg-pubkey's dont have os or arch (sigh), for others they are required 
*/
-    if (!rstreq(p->name, "gpg-pubkey") && (p->arch == NULL || p->os == NULL))
+    if (p->arch == NULL || p->os == NULL) {
+       if (p->type == TR_REMOVED && rstreq(p->name, "gpg-pubkey")) {
+           rpmlog(RPMLOG_WARNING, "erasing gpg-pubkey packages is deprecated; 
use rpmkeys --delete %s\n", p->version);
+       } else {
+           goto exit;
+       }
+    }
+
+    if (p->type != TR_REMOVED && rstreq(p->name, "gpg-pubkey")) {
+       rpmlog(RPMLOG_ERR, "public keys can not be installed as gpg-pubkey 
packages; use rpmkeys --import <keyfile> for that\n");

No, there should not. If you are seeing both messages and you get confused by 
them being formatted the same way, there is really nothing I can do for you.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/3478#discussion_r1867767231
You are receiving this because you are subscribed to this thread.

Message ID: <rpm-software-management/rpm/pull/3478/review/2475754...@github.com>
_______________________________________________
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
https://lists.rpm.org/mailman/listinfo/rpm-maint

Reply via email to