Author: lslezak
Date: Wed Apr 2 16:46:40 2008
New Revision: 45985
URL: http://svn.opensuse.org/viewcvs/yast?rev=45985&view=rev
Log:
- adapted to the new callback registration scheme (fate#302296)
Modified:
trunk/autoinstallation/package/autoyast2.changes
trunk/autoinstallation/src/clients/autoyast.ycp
trunk/autoinstallation/src/clients/software_auto.ycp
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=45985&r1=45984&r2=45985&view=diff
==============================================================================
--- trunk/autoinstallation/package/autoyast2.changes (original)
+++ trunk/autoinstallation/package/autoyast2.changes Wed Apr 2 16:46:40 2008
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Apr 2 16:45:44 CEST 2008 - lslezak@suse.cz
+
+- adapted to the new callback registration scheme (fate#302296)
+
+-------------------------------------------------------------------
Tue Apr 1 12:08:54 CEST 2008 - ug@suse.de
- "encryption switch" fixed when opening an encrypted profile
Modified: trunk/autoinstallation/src/clients/autoyast.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/autoyast.ycp?rev=45985&r1=45984&r2=45985&view=diff
==============================================================================
--- trunk/autoinstallation/src/clients/autoyast.ycp (original)
+++ trunk/autoinstallation/src/clients/autoyast.ycp Wed Apr 2 16:46:40 2008
@@ -20,6 +20,7 @@
import "AddOnProduct";
import "CommandLine";
import "Y2ModuleConfig";
+ import "AutoInstall";
include "autoinstall/dialogs.ycp";
include "autoinstall/conftree.ycp";
@@ -34,10 +35,10 @@
return `abort;
}
- Pkg::CallbackImportGpgKey("AutoInstall::callbackTrue");
- Pkg::CallbackAcceptUnknownGpgKey("AutoInstall::callbackTrue");
- Pkg::CallbackAcceptFileWithoutChecksum("AutoInstall::callbackTrue");
- Pkg::CallbackAcceptUnsignedFile("AutoInstall::callbackTrue");
+ Pkg::CallbackImportGpgKey(AutoInstall::callbackTrue_boolean_map);
+ Pkg::CallbackAcceptUnknownGpgKey(AutoInstall::callbackTrue_boolean_string_string);
+ Pkg::CallbackAcceptFileWithoutChecksum(AutoInstall::callbackTrue_boolean_string);
+ Pkg::CallbackAcceptUnsignedFile(AutoInstall::callbackTrue_boolean_string);
define boolean openFile( map options ) {
if( !Profile::ReadXML( options["filename"]:"" ) ) {
Modified: trunk/autoinstallation/src/clients/software_auto.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/software_auto.ycp?rev=45985&r1=45984&r2=45985&view=diff
==============================================================================
--- trunk/autoinstallation/src/clients/software_auto.ycp (original)
+++ trunk/autoinstallation/src/clients/software_auto.ycp Wed Apr 2 16:46:40 2008
@@ -17,6 +17,7 @@
import "AutoinstSoftware";
import "Label";
import "PackageAI";
+ import "AutoInstall";
include "autoinstall/dialogs.ycp";
@@ -51,8 +52,9 @@
</p>
");
//Pkg::TargetFinish ();
- Pkg::CallbackAcceptFileWithoutChecksum("AutoInstall::callbackTrue");
- Pkg::CallbackAcceptUnsignedFile("AutoInstall::callbackTrue");
+ Pkg::CallbackAcceptFileWithoutChecksum(AutoInstall::callbackTrue_boolean_string);
+ Pkg::CallbackAcceptUnsignedFile(AutoInstall::callbackTrue_boolean_string);
+
Pkg::TargetInit("/", false);
// AutoinstSoftware::pmInit();
Modified: trunk/autoinstallation/src/modules/AutoInstall.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoInstall.ycp?rev=45985&r1=45984&r2=45985&view=diff
==============================================================================
--- trunk/autoinstallation/src/modules/AutoInstall.ycp (original)
+++ trunk/autoinstallation/src/modules/AutoInstall.ycp Wed Apr 2 16:46:40 2008
@@ -20,11 +20,40 @@
global boolean autoconf = false;
- global define boolean callbackTrue() {
+ global define boolean callbackTrue_boolean_string(string dummy) {
return true;
}
- global define boolean callbackFalse() {
+ global define boolean callbackFalse_boolean_string(string dummy) {
+ return false;
+ }
+
+ global define void callback_void_map(map dummy_map) {
+ return;
+ }
+
+ global define boolean callbackTrue_boolean_map(map dummy_map) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_map(map dummy_map) {
+ return false;
+ }
+
+
+ global define boolean callbackTrue_boolean_string_map(string dummy, map dummy_map) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_string_map(string dummy, map dummy_map) {
+ return false;
+ }
+
+ global define boolean callbackTrue_boolean_string_string(string dummy1, string dummy2) {
+ return true;
+ }
+
+ global define boolean callbackFalse_boolean_string_string(string dummy1, string dummy2) {
return false;
}
Modified: trunk/autoinstallation/src/modules/AutoinstGeneral.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstGeneral.ycp?rev=45985&r1=45984&r2=45985&view=diff
==============================================================================
--- trunk/autoinstallation/src/modules/AutoinstGeneral.ycp (original)
+++ trunk/autoinstallation/src/modules/AutoinstGeneral.ycp Wed Apr 2 16:46:40 2008
@@ -173,35 +173,35 @@
global define void SetSignatureHandling() {
if( haskey(signature_handling, "accept_unsigned_file" ) )
Pkg::CallbackAcceptUnsignedFile(
- signature_handling["accept_unsigned_file"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_unsigned_file"]:false ? AutoInstall::callbackTrue_boolean_string : AutoInstall::callbackFalse_boolean_string
);
if( haskey(signature_handling, "accept_file_without_checksum" ) )
Pkg::CallbackAcceptFileWithoutChecksum(
- signature_handling["accept_file_without_checksum"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_file_without_checksum"]:false ? AutoInstall::callbackTrue_boolean_string : AutoInstall::callbackFalse_boolean_string
);
if( haskey(signature_handling, "accept_verification_failed") )
Pkg::CallbackAcceptVerificationFailed(
- signature_handling["accept_verification_failed"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_verification_failed"]:false ? AutoInstall::callbackTrue_boolean_string_map : AutoInstall::callbackFalse_boolean_string_map
);
if( haskey(signature_handling, "trusted_key_added") )
- Pkg::CallbackTrustedKeyAdded(
- signature_handling["trusted_key_added"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ Pkg::CallbackTrustedKeyAdded(
+ AutoInstall::callback_void_map
);
if( haskey(signature_handling, "trusted_key_removed") )
- Pkg::CallbackTrustedKeyRemoved(
- signature_handling["trusted_key_removed"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ Pkg::CallbackTrustedKeyRemoved(
+ AutoInstall::callback_void_map
);
if( haskey(signature_handling, "accept_unknown_gpg_key") )
Pkg::CallbackAcceptUnknownGpgKey(
- signature_handling["accept_unknown_gpg_key"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_unknown_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_string_string : AutoInstall::callbackFalse_boolean_string_string
);
if( haskey(signature_handling, "import_gpg_key") )
Pkg::CallbackImportGpgKey(
- signature_handling["import_gpg_key"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["import_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_map : AutoInstall::callbackFalse_boolean_map
);
if( haskey(signature_handling, "accept_non_trusted_gpg_key") )
Pkg::CallbackAcceptNonTrustedGpgKey(
- signature_handling["accept_non_trusted_gpg_key"]:false ? "AutoInstall::callbackTrue" : "AutoInstall::callbackFalse"
+ signature_handling["accept_non_trusted_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_map : AutoInstall::callbackFalse_boolean_map
);
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
lslezak＠svn.opensuse.org