Author: locilka Date: Wed Nov 7 13:46:18 2007 New Revision: 41840 URL: http://svn.opensuse.org/viewcvs/yast?rev=41840&view=rev Log: - Some variables were moved from AutoinstStorage, AutoinstGeneral, and AutoinstSoftware to AutoinstData (yast2.rpm) to break cyclic dependencies. - Adjusted RPM dependencies. - 2.16.2 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstGeneral.ycp trunk/autoinstallation/src/modules/AutoinstSoftware.ycp trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=41840&r1=41839&r2=41840&view=diff ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Nov 7 13:46:18 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.in?rev=41840&r1=41839&r2=41840&view=diff ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Wed Nov 7 13:46:18 2007 @@ -23,6 +23,9 @@ Version: @VERSION@ Summary: YaST2 - Auto-Installation: Installation Modules Group: System/YaST +# Some variables were moved from AutoinstStorage, AutoinstGeneral, and AutoinstSoftware +# to AutoinstData (yast2.rpm) to break cyclic dependencies. +Requires: yast2 >= 2.16.8 Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-update Provides: yast2-trans-autoinst Obsoletes: yast2-trans-autoinst Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=41840&r1=41839&r2=41840&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Nov 7 13:46:18 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Nov 7 11:15:18 CET 2007 - locilka@suse.cz + +- Some variables were moved from AutoinstStorage, AutoinstGeneral, + and AutoinstSoftware to AutoinstData (yast2.rpm) to break cyclic + dependencies. +- Adjusted RPM dependencies. +- 2.16.2 + +------------------------------------------------------------------- Wed Oct 24 16:38:40 CEST 2007 - ug@suse.de - API Call to Storage fixed (#335582) Modified: trunk/autoinstallation/src/modules/AutoinstGeneral.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstGeneral.ycp?rev=41840&r1=41839&r2=41840&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstGeneral.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstGeneral.ycp Wed Nov 7 13:46:18 2007 @@ -24,6 +24,9 @@ import "Profile"; import "Pkg"; + // All shared data are in yast2.rpm to break cyclic dependencies + import "AutoinstData"; + // // Show proposal and ask user for confirmation to go on with auto-installation // Similar to interactive mode, without letting use change settings @@ -32,26 +35,6 @@ global boolean Confirm = true; // - // Keyboard - // - //global map keyboard = $[]; - - // - // Language - // - //global string language = ""; - - // - // Mouse, if not autoprobed - // - global map mouse = $[]; - - // - // Clock Settings - // - //global map Clock = $[]; - - // // Mode Settings // global map mode = $[]; @@ -63,7 +46,6 @@ /* default value of settings modified */ global boolean modified = false; - /** * Function sets internal variable, which indicates, that any * settings were modified, to "true" @@ -90,9 +72,9 @@ //string keyboard_name = ""; string mouse_name = ""; - if ( mouse["id"]:"" != "" && mouse["id"]:"" != "probe") + if ( AutoinstData::mouse["id"]:"" != "" && AutoinstData::mouse["id"]:"" != "probe") { - Mouse::Set(mouse["id"]:""); + Mouse::Set(AutoinstData::mouse["id"]:""); mouse_name = Mouse::MakeProposal(false, false); } else @@ -141,7 +123,7 @@ { SetModified (); y2milestone("General import: %1",settings); - mouse = settings["mouse"]:$[]; + AutoinstData::mouse = settings["mouse"]:$[]; mode = settings["mode"]:$[]; signature_handling = settings["signature-handling"]:$[]; askList = settings["ask-list"]:[]; @@ -168,7 +150,7 @@ general["keyboard"] = keyboard; general["clock"] = Clock; */ - general["mouse"] = mouse; + general["mouse"] = AutoinstData::mouse; general["mode"] = mode; general["signature-handling"] = signature_handling; general["ask-list"] = askList; @@ -229,18 +211,18 @@ // mouse // - if ( mouse["id"]:"" != "probe" && mouse["id"]:"" != "") + if ( AutoinstData::mouse["id"]:"" != "probe" && AutoinstData::mouse["id"]:"" != "") { - Mouse::Set(mouse["id"]:""); + Mouse::Set(AutoinstData::mouse["id"]:""); } - else if (haskey(mouse,"device")) + else if (haskey(AutoinstData::mouse,"device")) { // // Otherwise, try to find the mouse id from the DB using data supplied by user, // at least the device is needed. // - string device = mouse["device"]:"none"; - integer wheels = mouse["wheels"]:0; + string device = AutoinstData::mouse["device"]:"none"; + integer wheels = AutoinstData::mouse["wheels"]:0; map mice = (map)Misc::ReadAlternateFile ("mouse_db.ycp", "mouse_raw.ycp"); @@ -248,10 +230,10 @@ map data = g[1]:$[]; if ( data["wheels"]:0 == wheels && data["device"]:"" == device) { - mouse["id"] = f; + AutoinstData::mouse["id"] = f; } }); - Mouse::Set(mouse["id"]:""); + Mouse::Set(AutoinstData::mouse["id"]:""); } SetSignatureHandling(); } Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstSoftware.ycp?rev=41840&r1=41839&r2=41840&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Wed Nov 7 13:46:18 2007 @@ -24,6 +24,9 @@ import "Storage"; import "Mode"; + // All shared data are in yast2.rpm to break cyclic dependencies + import "AutoinstData"; + import "PackageAI"; global map Software = $[]; @@ -37,7 +40,7 @@ global string kernel = ""; // Packages that should be installed in continue mode - global list<string> post_packages = []; + // AutoinstData::post_packages = []; global string ft_module = ""; @@ -92,7 +95,7 @@ PackageAI::toinstall = settings["packages"]:[]; kernel = settings["kernel"]:""; - post_packages = settings["post-packages"]:[]; + AutoinstData::post_packages = settings["post-packages"]:[]; PackageAI::toremove = settings["remove-packages"]:[]; /* Imaging */ @@ -141,8 +144,8 @@ if (PackageAI::toinstall != []) s["packages"] = PackageAI::toinstall; - if (post_packages != []) - s["post-packages"] = post_packages ; + if (AutoinstData::post_packages != []) + s["post-packages"] = AutoinstData::post_packages ; if (PackageAI::toremove != []) s["remove-packages"] = PackageAI::toremove; @@ -433,7 +436,7 @@ */ global define void addPostPackages(list<string> calcpost) { - post_packages = (list<string>)toset(union(calcpost,post_packages)); + AutoinstData::post_packages = (list<string>)toset(union(calcpost,AutoinstData::post_packages)); return; } Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstStorage.ycp?rev=41840&r1=41839&r2=41840&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Wed Nov 7 13:46:18 2007 @@ -20,6 +20,9 @@ import "Popup"; import "Report"; + // All shared data are in yast2.rpm to break cyclic dependencies + import "AutoinstData"; + include "partitioning/partition_defines.ycp"; // Read existing fstab and format partitions, but dont create anything @@ -29,15 +32,6 @@ // Fstab options global map fstab = $[]; - // Show warning for /boot on raid - global boolean BootRaidWarning = true; - - // Show warning for /boot on lvm - global boolean BootLVMWarning = true; - - // Show warning for /boot cyl <1024 - global boolean BootCylWarning = true; - // Partition plan as parsed from control file global list<map> AutoPartPlan = []; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org