Author: ug Date: Wed Apr 28 14:05:15 2010 New Revision: 61896 URL: http://svn.opensuse.org/viewcvs/yast?rev=61896&view=rev Log: old callback popups behavior for add-ons (comapt issue) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoInstall.ycp trunk/autoinstallation/src/modules/AutoinstGeneral.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=61896&r1=61895&r2=61896&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Apr 28 14:05:15 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 28 14:02:30 CEST 2010 - ug@suse.de + +- old callback behavior (popups) for add-ons if no + signature-handling is configured. + +------------------------------------------------------------------- Wed Apr 28 11:14:29 CEST 2010 - ug@suse.de - path to image script fixed Modified: trunk/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoInstall.ycp?rev=61896&r1=61895&r2=61896&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstall.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstall.ycp Wed Apr 28 14:05:15 2010 @@ -79,6 +79,15 @@ global define boolean callbackFalse_boolean_string_string_integer(string dummy1, string dummy2, integer dummy3) { return false; } + + global define boolean callbackTrue_boolean_string_string_string(string dummy1, string dummy2, string dummy3) { + return true; + } + + global define boolean callbackFalse_boolean_string_string_string(string dummy1, string dummy2, string dummy3) { + return false; + } + /** * Read saved data in continue mode * @return boolean true on success Modified: trunk/autoinstallation/src/modules/AutoinstGeneral.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstGeneral.ycp?rev=61896&r1=61895&r2=61896&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstGeneral.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstGeneral.ycp Wed Apr 28 14:05:15 2010 @@ -25,6 +25,7 @@ import "Pkg"; import "ProductFeatures"; import "Storage"; + import "SignatureCheckCallbacks"; // All shared data are in yast2.rpm to break cyclic dependencies import "AutoinstData"; @@ -177,6 +178,20 @@ * @return void */ global define void SetSignatureHandling() { + + // this will break compatibility a bit. A XML file without signature handling can + // block the installation now because we have the popups back + Pkg::CallbackAcceptUnsignedFile (SignatureCheckCallbacks::AcceptUnsignedFile); + Pkg::CallbackAcceptFileWithoutChecksum (SignatureCheckCallbacks::AcceptFileWithoutChecksum); + Pkg::CallbackAcceptVerificationFailed (SignatureCheckCallbacks::AcceptVerificationFailed); + Pkg::CallbackTrustedKeyAdded (SignatureCheckCallbacks::TrustedKeyAdded); + Pkg::CallbackAcceptUnknownGpgKey (SignatureCheckCallbacks::AcceptUnknownGpgKey); + Pkg::CallbackImportGpgKey (SignatureCheckCallbacks::ImportGpgKey); + Pkg::CallbackAcceptNonTrustedGpgKey (SignatureCheckCallbacks::TrustGpgKey); + Pkg::CallbackAcceptWrongDigest (SignatureCheckCallbacks::AcceptWrongDigest); + Pkg::CallbackAcceptUnknownDigest (SignatureCheckCallbacks::AcceptUnknownDigest); + Pkg::CallbackTrustedKeyRemoved (SignatureCheckCallbacks::TrustedKeyRemoved); + if( haskey(signature_handling, "accept_unsigned_file" ) ) Pkg::CallbackAcceptUnsignedFile( signature_handling["accept_unsigned_file"]:false ? AutoInstall::callbackTrue_boolean_string_integer : AutoInstall::callbackFalse_boolean_string_integer @@ -209,6 +224,14 @@ Pkg::CallbackAcceptNonTrustedGpgKey( signature_handling["accept_non_trusted_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_map : AutoInstall::callbackFalse_boolean_map ); + if( haskey(signature_handling, "accept_wrong_digest") ) + Pkg::CallbackAcceptWrongDigest( + signature_handling["accept_wrong_digest":false ? AutoInstall::callbackTrue_boolean_string_string_string : AutoInstall::callbackFalse_boolean_string_string_string + ); + if( haskey(signature_handling, "accept_unknown_digest") ) + Pkg::CallbackAcceptWrongDigest( + signature_handling["accept_unknown_digest":false ? AutoInstall::callbackTrue_boolean_string_string : AutoInstall::callbackFalse_boolean_string_string + ); } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org