Remove all other subkey handling code Inline the remaining few lines of keyringAdd in keystore.cc
This slightly changes the DEBUG messages as the keyring does not have access to the origin of the keys. So rpmtsLoadKeyringFrom* still gives the location the keys came from while the keyring only lists the fingerprint of the primary keys and the number for the sub keys. This changes the return value of rpmKeystoreLoad to the number of primary keys and no longer accounts for the subkeys. Subkeys are covered by multiple test already - including merging a newer key. So this does not add additional tests. Resolves: #3350 You can view, comment on, or merge this pull request online at: https://github.com/rpm-software-management/rpm/pull/3403 -- Commit Summary -- * Simplify rpmKeyringModify(RPMKEYRING_REPLACE) * Handle subkeys in rpmKeyringModify -- File Changes -- M lib/keystore.cc (34) M lib/rpmts.cc (11) M rpmio/rpmkeyring.cc (28) -- Patch Links -- https://github.com/rpm-software-management/rpm/pull/3403.patch https://github.com/rpm-software-management/rpm/pull/3403.diff -- Reply to this email directly or view it on GitHub: https://github.com/rpm-software-management/rpm/pull/3403 You are receiving this because you are subscribed to this thread. Message ID: <rpm-software-management/rpm/pull/3...@github.com>
_______________________________________________ Rpm-maint mailing list Rpm-maint@lists.rpm.org http://lists.rpm.org/mailman/listinfo/rpm-maint
