Author: ug Date: Wed Sep 3 17:00:14 2008 New Revision: 50627 URL: http://svn.opensuse.org/viewcvs/yast?rev=50627&view=rev Log: cloning for software and partitioning optional Modified: trunk/autoinstallation/src/include/conftree.ycp trunk/autoinstallation/src/modules/AutoinstClone.ycp Modified: trunk/autoinstallation/src/include/conftree.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/conftree.ycp?rev=50627&r1=50626&r2=50627&view=diff ============================================================================== --- trunk/autoinstallation/src/include/conftree.ycp (original) +++ trunk/autoinstallation/src/include/conftree.ycp Wed Sep 3 17:00:14 2008 @@ -22,6 +22,7 @@ import "Stage"; import "Icon"; import "AutoinstSoftware"; + import "AutoinstClone"; string title = _("Autoinstallation - Configuration"); @@ -190,7 +191,9 @@ /* enable disable read button */ map resourceMap = Y2ModuleConfig::ModuleMap[selectedModule]:$[]; boolean clonable = resourceMap["X-SuSE-YaST-AutoInstClonable"]:"false" == "true"; - if( ! clonable ){ + if( ! clonable && + "software" != selectedModule && + "partitioning" != selectedModule ){ UI::ChangeWidget(`id(`read), `Enabled, false ); } } @@ -263,10 +266,19 @@ boolean readModule(string module_name){ map resourceMap = Y2ModuleConfig::ModuleMap[module_name]:$[]; string auto = resourceMap["X-SuSE-YaST-AutoInstClient"]:""; - - Call::Function(auto , ["Read"]); - Call::Function(auto , ["SetModified"]); - Profile:prepare = true; + if( module_name == "software" ){ + Call::Function("software_auto" , ["Import", AutoinstClone::Software()]); + Call::Function("software_auto" , ["SetModified"]); + } + else if( module_name == "partitioning" ){ + Call::Function("storage_auto" , ["Import", AutoinstClone::Partitioning()]); + Call::Function("storage_auto" , ["SetModified"]); + } + else{ + Call::Function(auto , ["Read"]); + Call::Function(auto , ["SetModified"]); + } + Profile::prepare = true; return true; } /** Modified: trunk/autoinstallation/src/modules/AutoinstClone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstClone.ycp?rev=50627&r1=50626&r2=50627&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstClone.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstClone.ycp Wed Sep 3 17:00:14 2008 @@ -51,7 +51,7 @@ */ global define void AutoinstClone() { - Mode::SetMode ("normal"); + //Mode::SetMode ("normal"); return; } @@ -524,7 +524,9 @@ foreach(string def_resource, map resourceMap, Y2ModuleConfig::ModuleMap, ``{ y2debug("r: %1 => %2", def_resource, resourceMap["X-SuSE-YaST-AutoInstClonable"]:"false" ); boolean clonable = ( resourceMap["X-SuSE-YaST-AutoInstClonable"]:"false" == "true" ); - if (clonable) + if ( clonable || + "partitioning" == def_resource || /* has no desktop file */ + "software" == def_resource ) /* has no desktop file */ { // Set resource name, if not using default value string resource = resourceMap["X-SuSE-YaST-AutoInstResource"]:""; @@ -541,6 +543,11 @@ } } }); + /* sort items for nicer display */ + items = sort( term x, term y, (list<term>) items, { + /* x[1] corresponds to name */ + return x[1]:"x" < y[1]:"y"; + }); return items; } @@ -560,18 +567,24 @@ if (resource == "") resource = def_resource; y2debug("current resource: %1", resource); - if (contains(additional, resource)) + if (contains(additional, resource) && + "partitioning" != resource && /* handled below */ + "software" != resource) /* handled below */ { boolean ret = CommonClone(def_resource, resourceMap); } }); - Call::Function("storage_auto" , ["Import", Partitioning()]); - Call::Function("storage_auto" , ["SetModified"]); - - Call::Function("software_auto" , ["Import", Software()]); - Call::Function("software_auto" , ["SetModified"]); + if( contains(additional, "partitioning")){ + Call::Function("storage_auto" , ["Import", Partitioning()]); + Call::Function("storage_auto" , ["SetModified"]); + } + + if( contains(additional, "software")){ + Call::Function("software_auto" , ["Import", Software()]); + Call::Function("software_auto" , ["SetModified"]); + } Call::Function("general_auto" , ["Import", General()]); Call::Function("general_auto" , ["SetModified"]); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org