Author: ug
Date: Thu Feb 5 16:06:37 2009
New Revision: 55282
URL: http://svn.opensuse.org/viewcvs/yast?rev=55282&view=rev
Log:
just some cleanup
Modified:
trunk/autoinstallation/src/modules/AutoinstConfig.ycp
trunk/autoinstallation/src/modules/Profile.ycp
Modified: trunk/autoinstallation/src/modules/AutoinstConfig.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstConfig.ycp?rev=55282&r1=55281&r2=55282&view=diff
==============================================================================
--- trunk/autoinstallation/src/modules/AutoinstConfig.ycp (original)
+++ trunk/autoinstallation/src/modules/AutoinstConfig.ycp Thu Feb 5 16:06:37 2009
@@ -211,7 +211,7 @@
foreach( map m, slpData, ``{
dummy = add( dummy, `item( substring( m["srvurl"]:"", 17), false) );
});
- term dlg = `Left( `ComboBox( `id(`choose), "Choose Profile", dummy ) );
+ term dlg = `Left( `ComboBox( `id(`choose), _("Choose Profile"), dummy ) );
UI::OpenDialog( `VBox( dlg, `PushButton(`id(`ok), "Ok" )) );
UI::UserInput();
cmdLine = (string)UI::QueryWidget(`id(`choose), `Value);
Modified: trunk/autoinstallation/src/modules/Profile.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Profile.ycp?rev=55282&r1=55281&r2=55282&view=diff
==============================================================================
--- trunk/autoinstallation/src/modules/Profile.ycp (original)
+++ trunk/autoinstallation/src/modules/Profile.ycp Thu Feb 5 16:06:37 2009
@@ -108,11 +108,9 @@
}
define void softwareCompat() {
- if( haskey( current, "software" ) && !contains(current["software","packages"]:[], "autoyast2-installation") ) {
+ current["software"] = current["software"]:$[];
+ if( !contains(current["software","packages"]:[], "autoyast2-installation") )
current["software","packages"] = add( current["software","packages"]:[], "autoyast2-installation" );
- } else {
- current["software"] = $[ "packages":[ "autoyast2-installation" ] ];
- }
/* without autoyast2,