Author: locilka Date: Wed Jul 4 11:00:35 2007 New Revision: 39153 URL: http://svn.opensuse.org/viewcvs/yast?rev=39153&view=rev Log: - Callback function for setting the trust level to the GnuPG key has been merged with a function for importing the same key. By now, if key is trusted, it's also imported (#282254). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SignatureCheckDialogs.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=39153&r1=39152&r2=39153&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jul 4 11:00:35 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 4 10:57:55 CEST 2007 - locilka@suse.cz + +- Callback function for setting the trust level to the GnuPG key + has been merged with a function for importing the same key. By + now, if key is trusted, it's also imported (#282254). + +------------------------------------------------------------------- Thu Jun 28 21:34:57 CEST 2007 - jsrain@suse.cz - updated for live CD installation Modified: trunk/packager/src/modules/SignatureCheckDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SignatureCheckDialogs.ycp?rev=39153&r1=39152&r2=39153&view=diff ============================================================================== --- trunk/packager/src/modules/SignatureCheckDialogs.ycp (original) +++ trunk/packager/src/modules/SignatureCheckDialogs.ycp Wed Jul 4 11:00:35 2007 @@ -595,6 +595,13 @@ } /** + * List of trusted keys + * + * @see bugzilla #282254 + */ + list <string> list_of_trusted_keys = []; + + /** * Used for file or package signed by a public key. This key is still * not listed in trusted keys. * @@ -641,7 +648,7 @@ `MarginBox(0.5, 0.5, `Label(description_text)), `HBox ( // push button - `PushButton(`id(`trust), _("&Trust the Key")), + `PushButton(`id(`trust), _("&Trust and Import the Key")), `HSpacing(1), `PushButton(`id(`skip), Label::SkipButton()) ) @@ -652,6 +659,13 @@ // wait for one of listed ID's, return the default value in case of `cancel symbol ret = WaitForSymbolUserInput([`trust, `skip], `skip); + if (ret == `trust) { + // later, if asking whether to import the key, the key is trusted + // so it will be also imported + // bugzilla #282254 + list_of_trusted_keys = add (list_of_trusted_keys, key_id); + } + UI::CloseDialog(); return ret; } @@ -766,6 +780,12 @@ * @return boolean whether zypp should import the key into the keyring of trusted keys */ global boolean ImportGPGKeyIntoTrustedDialog (string key_id, string key_name, string fingerprint) { + // bugzilla #282254 + if (key_id != "" && key_id != nil && contains (list_of_trusted_keys, key_id)) { + y2milestone ("Key '%1' is trusted, importing...", key_id); + return true; + } + // additional Richtext (HTML) warning text (kind of help), 1/2 string warning_text = _("<p>The owner of the key may distribute updates, packages, and package repositories that your system will trust and offer -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org