Modify message about skipped verification

rpm-software-management · May 27, 2024 · abc4fdd · abc4fdd
1 parent 13672b6
commit abc4fdd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/libdnf5/base/transaction.cpp b/libdnf5/base/transaction.cpp
@@ -1321,10 +1321,10 @@ bool Transaction::Impl::check_gpg_signatures() {
             repos_with_skipped_checks, C_("It is a joining character for repositories IDs", ", "));
         auto warning_msg =
             (num_checks_skipped == 1)
-                ? utils::sformat(_("Warning: skipped PGP checks for 1 package from {} repository."), repo_string)
+                ? utils::sformat(_("Warning: skipped PGP checks for 1 package from repository: {}"), repo_string)
                 : utils::sformat(
-                      P_("Warning: skipped PGP checks for {0} packages from {1} repository.",
-                         "Warning: skipped PGP checks for {0} packages from {1} repositories.",
+                      P_("Warning: skipped PGP checks for {0} packages from repository: {1}",
+                         "Warning: skipped PGP checks for {0} packages from repositories: {1}",
                          repos_with_skipped_checks.size()),
                       num_checks_skipped,
                       repo_string);

diff --git a/test/libdnf5/base/test_transaction.cpp b/test/libdnf5/base/test_transaction.cpp
@@ -38,7 +38,7 @@ void BaseTransactionTest::test_check_gpg_signatures_no_gpgcheck() {
     CPPUNIT_ASSERT(transaction.check_gpg_signatures());
     CPPUNIT_ASSERT_EQUAL((size_t)1, transaction.get_gpg_signature_problems().size());
     CPPUNIT_ASSERT_EQUAL(
-        std::string("Warning: skipped PGP checks for 1 package from repomd-repo1 repository."),
+        std::string("Warning: skipped PGP checks for 1 package from repository: repomd-repo1"),
         transaction.get_gpg_signature_problems()[0]);
 }
 

diff --git a/test/python3/libdnf5/base/test_transaction.py b/test/python3/libdnf5/base/test_transaction.py
@@ -32,7 +32,7 @@ def test_check_gpg_signatures_no_gpgcheck(self):
 
         self.assertEqual(1, transaction.get_transaction_packages_count())
         self.assertTrue(transaction.check_gpg_signatures())
-        self.assertEqual(('Warning: skipped PGP checks for 1 package from repomd-repo1 repository.',),
+        self.assertEqual(('Warning: skipped PGP checks for 1 package from repository: repomd-repo1',),
                          transaction.get_gpg_signature_problems())
 
     def test_check_gpg_signatures_fail(self):