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.

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

Use "OpenPGP" instead of "PGP" #1601

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dnf-behave-tests/dnf/comps-group.feature
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ Scenario: Install an environment with a nonexistent group
"""
No match for group from environment: nonexistent-group

Warning: skipped PGP checks for 1 package from repository: comps-group
Warning: skipped OpenPGP checks for 1 package from repository: comps-group
"""


Expand All @@ -545,7 +545,7 @@ Scenario: Install an environment using @^environment syntax
"""
No match for group from environment: nonexistent-group

Warning: skipped PGP checks for 1 package from repository: comps-group
Warning: skipped OpenPGP checks for 1 package from repository: comps-group
"""


Expand Down
4 changes: 2 additions & 2 deletions dnf-behave-tests/dnf/distro-sync.feature
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Scenario: distro-sync list of packages with --skip-unavailable, one of them is n
And stderr contains lines
"""
No match for argument: nosuchpkg
Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""
And Transaction is following
| Action | Package |
Expand Down Expand Up @@ -151,7 +151,7 @@ Scenario: distro-sync list of packages with --skip-unavailable, one of them is n
And stderr contains lines
"""
Packages for argument 'dwm' available, but not installed.
Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""
And Transaction is following
| Action | Package |
Expand Down
6 changes: 3 additions & 3 deletions dnf-behave-tests/dnf/downgrade.feature
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Scenario: Downgrade list of packages with --skip-unavailable, one of them is not
"""
No match for argument: nosuchpkg

Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""
And Transaction is following
| Action | Package |
Expand Down Expand Up @@ -157,7 +157,7 @@ Scenario: Downgrade list of packages with --skip-unavailable, one of them is not
"""
Packages for argument 'abcde' available, but not installed.

Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""
And Transaction is following
| Action | Package |
Expand Down Expand Up @@ -192,7 +192,7 @@ Scenario: Downgrade mixture of not available/not installed/not downgradable/down
The lowest available version of the "wget.x86_64" package is already installed, cannot downgrade it.
Packages for argument 'abcde' available, but not installed.

Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""
And Transaction is following
| Action | Package |
Expand Down
4 changes: 2 additions & 2 deletions dnf-behave-tests/dnf/download-source.feature
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Given I make packages from repository "dnf-ci-fedora" accessible via http
Then the exit code is 0
And stderr contains lines
"""
Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora
"""
And Transaction is following
| Action | Package |
Expand All @@ -141,7 +141,7 @@ Given I make packages from repository "dnf-ci-fedora" accessible via http
Then the exit code is 0
And stderr contains lines
"""
Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora
"""
And Transaction is following
| Action | Package |
Expand Down
2 changes: 1 addition & 1 deletion dnf-behave-tests/dnf/history-redo.feature
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Scenario: Redo a transaction with a package that is no longer available and --sk
"""
Cannot perform Install action because 'filesystem-3.9-2.fc29.x86_64' matches only excluded packages.

Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora
"""


Expand Down
2 changes: 1 addition & 1 deletion dnf-behave-tests/dnf/history-rollback-env-upgrade.feature
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Scenario: Rollback a rollbacked environment upgrade transaction
Group upgrade cannot be reverted, however associated package actions will be. (Group id: 'dnf-ci-group-rollback-testgroup2') .
Environment upgrade cannot be reverted, however associated package actions will be. (Environment id: 'dnf-ci-group-rollback-testenv') .

Warning: skipped PGP checks for 4 packages from repository: dnf-ci-group-rollback-1
Warning: skipped OpenPGP checks for 4 packages from repository: dnf-ci-group-rollback-1
"""
And History is following
| Id | Command | Action | Altered |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Scenario: Rollback a rollbacked group upgrade transaction
"""
Group upgrade cannot be reverted, however associated package actions will be. (Group id: 'dnf-ci-group-rollback-testgroup1') .

Warning: skipped PGP checks for 2 packages from repository: dnf-ci-group-rollback-1
Warning: skipped OpenPGP checks for 2 packages from repository: dnf-ci-group-rollback-1
"""
And History is following
| Id | Command | Action | Altered |
Expand Down
2 changes: 1 addition & 1 deletion dnf-behave-tests/dnf/history-undo.feature
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ Scenario: Undo a downgrade transaction
| upgrade | wget-0:1.19.6-5.fc29.x86_64 |
And stderr contains lines
"""
Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""


Expand Down
2 changes: 1 addition & 1 deletion dnf-behave-tests/dnf/install-dependencies.feature
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ Scenario: Best candidates have conflicting dependencies
- cannot install the best candidate for the job
- conflicting requests

Warning: skipped PGP checks for 3 packages from repository: install-dependencies
Warning: skipped OpenPGP checks for 3 packages from repository: install-dependencies
"""
2 changes: 1 addition & 1 deletion dnf-behave-tests/dnf/install-file-conflicts.feature
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ Scenario: An error is reported when a package with a file conflict is tried to b
And stderr contains lines
"""
Transaction failed: Rpm transaction failed.
Warning: skipped PGP checks for 1 package from repository: dnf-ci-install-conflicts
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-install-conflicts
- file /usr/lib/package/conflicting-file from install of package-two-0:1.0-1.x86_64 conflicts with file from package package-one-0:1.0-1.x86_64
"""
4 changes: 2 additions & 2 deletions dnf-behave-tests/dnf/install-latest-deps.feature
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Scenario: prefer installing latests dependencies rather than smaller transaction
| upgrade | krb5-libs-0:2.0-1.fc29.x86_64 |
And stderr contains lines
"""
Warning: skipped PGP checks for 3 packages from repository: install-latest-deps
Warning: skipped OpenPGP checks for 3 packages from repository: install-latest-deps
"""


Expand All @@ -29,5 +29,5 @@ Scenario: if latests dependencies are not possible to install fall back to lower
| install-dep | krb5-pkinit-0:1.0-1.fc29.x86_64 |
And stderr contains lines
"""
Warning: skipped PGP checks for 2 packages from repository: install-latest-deps
Warning: skipped OpenPGP checks for 2 packages from repository: install-latest-deps
"""
2 changes: 1 addition & 1 deletion dnf-behave-tests/dnf/install-non-existent.feature
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Scenario: Install an existent and an non-existent package with --skip-unavailabl
"""
No match for argument: non-existent-package

Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora
"""
And Transaction is following
| Action | Package |
Expand Down
2 changes: 1 addition & 1 deletion dnf-behave-tests/dnf/obsoletes.feature
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ Scenario: Obsoleted package is not installed when group contains both obsoleter
| group-install | Obsoleter and obsoleted |
And stderr contains lines
"""
Warning: skipped PGP checks for 1 package from repository: dnf-ci-obsoletes
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-obsoletes
"""


Expand Down
2 changes: 1 addition & 1 deletion dnf-behave-tests/dnf/plugins-core/builddep.feature
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ Scenario: Builddep using macros with source rpm
And stderr contains lines
"""
Warning: -D/--define/--with/--without arguments have no effect on source rpm packages.
Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora
"""


Expand Down
16 changes: 8 additions & 8 deletions dnf-behave-tests/dnf/plugins-core/reposync.feature
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,11 @@ Scenario: Reposync --gpgcheck removes unsigned packages and packages signed by n
Then the exit code is 1
And stderr contains lines matching
"""
Removing '.*/reposync-gpg/src/dedalo-signed-1\.0-1\.fc29\.src\.rpm' with failing PGP check: No corresponding key was found\.
Removing '.*/reposync-gpg/x86_64/dedalo-signed-1\.0-1\.fc29\.x86_64\.rpm' with failing PGP check: No corresponding key was found\.
Removing '.*/reposync-gpg/src/dedalo-unsigned-1\.0-1\.fc29\.src\.rpm' with failing PGP check: The package is not signed\.
Removing '.*/reposync-gpg/x86_64/dedalo-unsigned-1\.0-1\.fc29\.x86_64\.rpm' with failing PGP check: The package is not signed\.
PGP signature check failed
Removing '.*/reposync-gpg/src/dedalo-signed-1\.0-1\.fc29\.src\.rpm' with failing OpenPGP check: No corresponding key was found\.
Removing '.*/reposync-gpg/x86_64/dedalo-signed-1\.0-1\.fc29\.x86_64\.rpm' with failing OpenPGP check: No corresponding key was found\.
Removing '.*/reposync-gpg/src/dedalo-unsigned-1\.0-1\.fc29\.src\.rpm' with failing OpenPGP check: The package is not signed\.
Removing '.*/reposync-gpg/x86_64/dedalo-unsigned-1\.0-1\.fc29\.x86_64\.rpm' with failing OpenPGP check: The package is not signed\.
OpenPGP signature check failed
"""
And file "//{context.dnf.tempdir}/reposync-gpg/x86_64/dedalo-unsigned-1.0-1.fc29.x86_64.rpm" does not exist
And file "//{context.dnf.tempdir}/reposync-gpg/x86_64/dedalo-signed-1.0-1.fc29.x86_64.rpm" does not exist
Expand All @@ -373,9 +373,9 @@ Scenario: Reposync --gpgcheck removes unsigned packages
Then the exit code is 1
And stderr contains lines matching
"""
Removing '.*/reposync-gpg/src/dedalo-unsigned-1\.0-1\.fc29\.src\.rpm' with failing PGP check: The package is not signed\.
Removing '.*/reposync-gpg/x86_64/dedalo-unsigned-1\.0-1\.fc29\.x86_64\.rpm' with failing PGP check: The package is not signed\.
PGP signature check failed
Removing '.*/reposync-gpg/src/dedalo-unsigned-1\.0-1\.fc29\.src\.rpm' with failing OpenPGP check: The package is not signed\.
Removing '.*/reposync-gpg/x86_64/dedalo-unsigned-1\.0-1\.fc29\.x86_64\.rpm' with failing OpenPGP check: The package is not signed\.
OpenPGP signature check failed
"""
And file "//{context.dnf.tempdir}/reposync-gpg/x86_64/dedalo-unsigned-1.0-1.fc29.x86_64.rpm" does not exist
And file "//{context.dnf.tempdir}/reposync-gpg/x86_64/dedalo-signed-1.0-1.fc29.x86_64.rpm" exists
Expand Down
4 changes: 2 additions & 2 deletions dnf-behave-tests/dnf/reinstall.feature
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Scenario: Reinstall list of packages with --skip-unavailable, one of them is not
"""
No match for argument: nosuchpkg

Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""
And Transaction is following
| Action | Package |
Expand All @@ -100,7 +100,7 @@ Scenario: Reinstall list of packages with --skip-unavailable, one of them is not
"""
Packages for argument 'abcde' available, but not installed.

Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""
And Transaction is following
| Action | Package |
Expand Down
16 changes: 8 additions & 8 deletions dnf-behave-tests/dnf/repoinfo.feature
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Scenario: Repo info without arguments
Config file : .*/etc/yum.repos.d/dnf-ci-fedora.repo
URLs :
Base URL : .*/fixtures/repos/dnf-ci-fedora
PGP :
OpenPGP :
Verify repodata : false
Verify packages : false
Repodata info :
Expand All @@ -54,7 +54,7 @@ Scenario: Repo info without arguments
Config file : .*/etc/yum.repos.d/dnf-ci-thirdparty-updates.repo
URLs :
Base URL : .*/fixtures/repos/dnf-ci-thirdparty-updates
PGP :
OpenPGP :
Verify repodata : false
Verify packages : false
Repodata info :
Expand Down Expand Up @@ -86,7 +86,7 @@ Scenario: Repo info without arguments and option --all
Config file : .*/etc/yum.repos.d/dnf-ci-fedora.repo
URLs :
Base URL : .*/fixtures/repos/dnf-ci-fedora
PGP :
OpenPGP :
Verify repodata : false
Verify packages : false
Repodata info :
Expand All @@ -107,7 +107,7 @@ Scenario: Repo info without arguments and option --all
Config file : .*/etc/yum.repos.d/dnf-ci-fedora-updates.repo
URLs :
Base URL : .*/fixtures/repos/dnf-ci-fedora-updates
PGP :
OpenPGP :
Verify repodata : false
Verify packages : false

Expand All @@ -122,7 +122,7 @@ Scenario: Repo info without arguments and option --all
Config file : .*/etc/yum.repos.d/dnf-ci-thirdparty.repo
URLs :
Base URL : .*/fixtures/repos/dnf-ci-thirdparty
PGP :
OpenPGP :
Verify repodata : false
Verify packages : false

Expand All @@ -137,7 +137,7 @@ Scenario: Repo info without arguments and option --all
Config file : .*/etc/yum.repos.d/dnf-ci-thirdparty-updates.repo
URLs :
Base URL : .*/fixtures/repos/dnf-ci-thirdparty-updates
PGP :
OpenPGP :
Verify repodata : false
Verify packages : false
Repodata info :
Expand Down Expand Up @@ -170,7 +170,7 @@ Scenario: Repoinfo without arguments but with excludes
Config file : .*/etc/yum.repos.d/dnf-ci-fedora.repo
URLs :
Base URL : .*/fixtures/repos/dnf-ci-fedora
PGP :
OpenPGP :
Verify repodata : false
Verify packages : false
Repodata info :
Expand All @@ -191,7 +191,7 @@ Scenario: Repoinfo without arguments but with excludes
Config file : .*/etc/yum.repos.d/dnf-ci-thirdparty-updates.repo
URLs :
Base URL : .*/fixtures/repos/dnf-ci-thirdparty-updates
PGP :
OpenPGP :
Verify repodata : false
Verify packages : false
Repodata info :
Expand Down
6 changes: 3 additions & 3 deletions dnf-behave-tests/dnf/transaction-sr/replay.feature
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@ Given I successfully execute dnf with args "install bottom-a1-1.0"
"""
Cannot perform Install action because 'bottom-a1-2.0-1.noarch' is installed in a different version: 'bottom-a1-1.0-1.noarch'.

Warning: skipped PGP checks for 2 packages from repository: transaction-sr
Warning: skipped OpenPGP checks for 2 packages from repository: transaction-sr
"""
And Transaction is following
| Action | Package |
Expand Down Expand Up @@ -1337,7 +1337,7 @@ Given I create file "/{context.dnf.tempdir}/transaction/transaction.json" with
"""
Cannot perform Remove action for Package 'bottom-a1-1.0-1.noarch' because it is not installed.

Warning: skipped PGP checks for 2 packages from repository: transaction-sr
Warning: skipped OpenPGP checks for 2 packages from repository: transaction-sr
"""
And Transaction is following
| Action | Package |
Expand Down Expand Up @@ -1410,7 +1410,7 @@ Given I create file "/{context.dnf.tempdir}/transaction/transaction.json" with
"""
Cannot perform Install action, no match for: does-not-exist-1.0-1.noarch.

Warning: skipped PGP checks for 1 package from repository: transaction-sr
Warning: skipped OpenPGP checks for 1 package from repository: transaction-sr
"""
And Transaction is following
| Action | Package |
Expand Down
10 changes: 5 additions & 5 deletions dnf-behave-tests/dnf/upgrade.feature
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Scenario: Upgrade list of packages with --skip-unavailable, one of them is not a
"""
No match for argument: nosuchpkg

Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""
And Transaction is following
| Action | Package |
Expand Down Expand Up @@ -114,7 +114,7 @@ Scenario: Upgrade list of packages with --skip-unavailable, one of them is not i
"""
Packages for argument 'dwm' available, but not installed.

Warning: skipped PGP checks for 1 package from repository: dnf-ci-fedora-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-fedora-updates
"""
And Transaction is following
| Action | Package |
Expand All @@ -138,7 +138,7 @@ Scenario: Upgrade all RPMs from multiple repositories with best=False
Problem: cannot install the best update candidate for package SuperRipper-1.0-1.x86_64
- nothing provides unsatisfiable needed by SuperRipper-1.3-1.x86_64 from dnf-ci-thirdparty-updates

Warning: skipped PGP checks for 7 packages from repositories: dnf-ci-fedora-updates, dnf-ci-fedora-updates-testing, dnf-ci-thirdparty-updates
Warning: skipped OpenPGP checks for 7 packages from repositories: dnf-ci-fedora-updates, dnf-ci-fedora-updates-testing, dnf-ci-thirdparty-updates
"""
And Transaction is following
| Action | Package |
Expand Down Expand Up @@ -190,7 +190,7 @@ Scenario: Upgrade all RPMs from multiple repositories with best=True
Problem: cannot install the best update candidate for package SuperRipper-1.0-1.x86_64
- nothing provides unsatisfiable needed by SuperRipper-1.3-1.x86_64 from dnf-ci-thirdparty-updates

Warning: skipped PGP checks for 7 packages from repositories: dnf-ci-fedora-updates, dnf-ci-fedora-updates-testing, dnf-ci-thirdparty-updates
Warning: skipped OpenPGP checks for 7 packages from repositories: dnf-ci-fedora-updates, dnf-ci-fedora-updates-testing, dnf-ci-thirdparty-updates
"""


Expand All @@ -209,7 +209,7 @@ Scenario: Print information about skipped packages
Problem: cannot install the best update candidate for package SuperRipper-1.0-1.x86_64
- nothing provides unsatisfiable needed by SuperRipper-1.3-1.x86_64 from dnf-ci-thirdparty-updates

Warning: skipped PGP checks for 1 package from repository: dnf-ci-thirdparty-updates
Warning: skipped OpenPGP checks for 1 package from repository: dnf-ci-thirdparty-updates
"""


Expand Down
Loading