Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle duplicate keys on GPG key ring #17242

Merged
merged 5 commits into from Oct 7, 2021
Merged

Handle duplicate keys on GPG key ring #17242

merged 5 commits into from Oct 7, 2021

Commits on Oct 6, 2021

  1. Handle duplicate keys on GPG key ring 

    It is possible that a keyring can contain duplicate keys on a keyring due to jpegs or
other layers. This currently leads to a confusing error for the user - where we report
a duplicate key insertion.

This PR simply coalesces keys into one key if there are duplicates.

Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    4deffe4 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. handle duplicate subkeys properly 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    f4cf47f View commit details
    Browse the repository at this point in the history

  2. rename to newEKeys 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    e4c3a9b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into handle-duplicate-keys-in-keyring

    @zeripath
    zeripath committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    6e976da View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into handle-duplicate-keys-in-keyring

    @6543
    6543 committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    6e91263 View commit details
    Browse the repository at this point in the history