Mailinglist Archive: zypp-commit (731 mails)

[kkaempf@xxxxxxxxxxxxxxxx]

Author: kkaempf
Date: Sat Aug 25 16:04:37 2007
New Revision: 6877

URL: http://svn.opensuse.org/viewcvs/zypp?rev=6877&view=rev
Log:
add some //FIXME
only show basename on Digest verification failure (#302059)

Modified:
    trunk/zypper/src/zypper-keyring-callbacks.h

Modified: trunk/zypper/src/zypper-keyring-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-keyring-callbacks.h?rev=6877&r1=6876&r2=6877&view=diff
==============================================================================
--- trunk/zypper/src/zypper-keyring-callbacks.h (original)
+++ trunk/zypper/src/zypper-keyring-callbacks.h Sat Aug 25 16:04:37 2007
@@ -108,7 +108,7 @@
               % file % keyid % keyname % fingerprint << endl;
           cerr << boost::format(
               _("Warning: Ignoring failed signature verification for %s"
-                " with public key id %s, %s, fingerprint %s!"
+                " with public key id %s, %s, fingerprint %s!"                        // FIXME: LINEBREAK!
                 " Double-check this is not caused by some malicious"
                 " changes in the file!"))
               %file % keyid % keyname % fingerprint << endl;
@@ -117,8 +117,8 @@
 
         std::string question = boost::str(boost::format(
             _("Signature verification failed for %s"
-              " with public key id %s, %s, fingerprint %s."
-              " Warning: This might be caused by a malicious change in the file!"
+              " with public key id %s, %s, fingerprint %s."                  // FIXME: LINEBREAK!
+              " Warning: This might be caused by a malicious change in the file!"                    // FIXME: LINEBREAK!
               " Continuing is risky! Continue anyway?"))
             % file % keyid % keyname % fingerprint);
         return read_bool_answer(question, false);
@@ -157,7 +157,7 @@
 
        std::string question = boost::str(boost::format(
            _("Digest verification failed for %s. Expected %s, found %s."))
-           % file % requested % found) + " " + _("Continue?");
+           % file.basename() % requested % found) + " " + _("Continue?");
         return read_bool_answer(question, false);
       }
     };

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx