January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60535 - in /branches/SuSE-Code-11-SP1-Branch/reipl: VERSION package/yast2-reipl.changes
by jsrain＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: jsrain Date: Tue Jan 26 14:00:13 2010 New Revision: 60535 URL: http://svn.opensuse.org/viewcvs/yast?rev=60535&view=rev Log: bump Modified: branches/SuSE-Code-11-SP1-Branch/reipl/VERSION branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes Modified: branches/SuSE-Code-11-SP1-Branch/reipl/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/reipl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/reipl/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/reipl/VERSION Tue Jan 26 14:00:13 2010 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/reipl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes Tue Jan 26 14:00:13 2010 @@ -2,6 +2,7 @@ Mon Apr 20 12:01:39 CEST 2009 - jsrain(a)suse.cz - fixed handling of more than 26 disks (bnc #492326) +- 2.17.4 ------------------------------------------------------------------- Mon Feb 9 09:38:05 CET 2009 - hare(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60534 - /tags/branch-Code-11-2_17_8_1/wagon/
by locilka＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: locilka Date: Tue Jan 26 12:49:03 2010 New Revision: 60534 URL: http://svn.opensuse.org/viewcvs/yast?rev=60534&view=rev Log: Created tag branch-Code-11-2_17_8_1 for wagon Added: tags/branch-Code-11-2_17_8_1/wagon/ - copied from r60533, branches/SuSE-Code-11-Branch/wagon/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60533 - /tags/branch-Code-11-2_17_8_1/
by locilka＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: locilka Date: Tue Jan 26 12:49:01 2010 New Revision: 60533 URL: http://svn.opensuse.org/viewcvs/yast?rev=60533&view=rev Log: Created tag branch-Code-11-2_17_8_1 Added: tags/branch-Code-11-2_17_8_1/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60532 - in /branches/SuSE-Code-11-Branch/wagon: ./ package/ src/ src/clients/ src/config/ src/include/ src/modules/
by locilka＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: locilka Date: Tue Jan 26 12:47:54 2010 New Revision: 60532 URL: http://svn.opensuse.org/viewcvs/yast?rev=60532&view=rev Log: - Upgrading installed products moved after wagon self-update and restart In some cases the newly added code was not executed (BNC #573084). - Wagon extended to read and use migration products from the <upgrade> section from product control files (BNC #559554). - 2.17.8.1 Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_point_of_no_return.ycp branches/SuSE-Code-11-Branch/wagon/src/include/ branches/SuSE-Code-11-Branch/wagon/src/include/Makefile.am branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp Modified: branches/SuSE-Code-11-Branch/wagon/VERSION branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/Makefile.am branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_selfupdate.ycp branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-Branch/wagon/VERSION Tue Jan 26 12:47:54 2010 @@ -1 +1 @@ -2.17.8 +2.17.8.1 Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Tue Jan 26 12:47:54 2010 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz + +- Upgrading installed products moved after wagon self-update and + restart In some cases the newly added code was not executed + (BNC #573084). +- 2.17.8.1 + +------------------------------------------------------------------- +Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz + +- Wagon extended to read and use migration products from the + <upgrade> section from product control files (BNC #559554). + +------------------------------------------------------------------- Mon Feb 9 10:10:05 CET 2009 - locilka(a)suse.cz - Added new wagon_congratulate client - an envelope that loads the Modified: branches/SuSE-Code-11-Branch/wagon/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/Makefile.am (original) +++ branches/SuSE-Code-11-Branch/wagon/src/Makefile.am Tue Jan 26 12:47:54 2010 @@ -2,5 +2,5 @@ # Makefile.am for wagon/src # -SUBDIRS = modules clients config +SUBDIRS = modules include clients config Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp Tue Jan 26 12:47:54 2010 @@ -26,6 +26,10 @@ import "CommandLine"; import "PackageLock"; import "PackageCallbacks"; + import "Report"; + import "FileUtils"; + + include "wagon/common_func.ycp"; textdomain "wagon"; @@ -137,6 +141,134 @@ } } + boolean RevertToOldProducts () { + if (Wagon::abort_can_revert_products != true) { + y2warning ("Cannot revert the previous state of products, sorry. Installed products were: %1, Migration products were: %2", + Wagon::products_before_migration, Wagon::migration_products); + + Report::Warning (_("Cannot revert the previous state of installed products. +You will have to revert them manually.")); + + return false; + } + + Wizard::SetContents ( + _("Reverting Migration"), + `Label(_("Migration tool has to remove the temporary migration products, +install the previously installed ones and contact Novell Customer Center +to get update repositories.")), + _("Several tasks can be done by the migration tool. If you skip this step, +you will have to do them manually."), + false, true + ); + Wizard::EnableAbortButton (); + + boolean cont = true; + while (true) { + any ret = UI::UserInput(); + if (ret == `next) { + cont = true; + break; + } else if (ret == `abort || ret == `cancel) { + if (Popup::AnyQuestion ( + // popup dialog caption + _("Migration Has to Be Reverted"), + // popup dialog qustion + _("Are you sure you want to skip reverting the migration?"), + // button + _("&Yes, Skip It"), + // button + _("&No"), + `focus_no + )) { + cont = false; + break; + } + } + } + + if (cont != true) { + y2warning ("User decided not to rollback"); + return false; + } + + ResetPackager(); + + // Full paths to product files + list <string> removed_product_files = []; + // Product packages + list <string> removed_packages = []; + + Wizard::SetContents ( + _("Reverting Migration"), + `Label(_("Removing temporary migration products...")), + "", + false, true + ); + + // Remove all the migration products using packages approach manually + // Removing via ResolvableRemove + PkgSolve usually produces errors, + // dependency loops etc. + // + y2milestone ("Removing newly installed products: %1", Wagon::migration_products); + foreach (string migration_product, Wagon::migration_products, { + foreach (map <string, any> remove_product, Pkg::ResolvableProperties (migration_product, `product, ""), { + remove_product = Wagon::MinimizeProductMap (remove_product); + + string product_file = remove_product["product_file"]:""; + if (product_file == nil || product_file == "") { + y2error ("Cannot remove product: %1, no product file defined", remove_product); + Report::Error (sformat(_("Cannot remove product %1"), remove_product["name"]:_("Unknown product"))); + return; + } + + if (! regexpmatch (product_file, "^/etc/products\\.d/.+")) + product_file = sformat ("/etc/products.d/%1", product_file); + + if (contains (removed_product_files, product_file)) { + y2milestone ("Product file %1 has been already removed", product_file); + return; + } + + string package_name = Wagon::GetFileOwner (product_file); + + if (package_name == nil || package_name == "") { + y2error ("Cannot find out file owner %1", product_file); + Report::Error (sformat(_("Cannot remove product %1"), remove_product["name"]:_("Unknown product"))); + return; + } + + if (Pkg::TargetRemove (package_name) != true) { + y2error ("Cannot remove package %1", package_name); + Report::Error (sformat(_("Cannot remove product %1. +Remove package %2 manually"), remove_product["name"]:_("Unknown product"), package_name)); + return; + } + + y2milestone ("Product %1/%2 has been successfully removed", remove_product, package_name); + removed_product_files = add (removed_product_files, product_file); + removed_packages = add (removed_packages, package_name); + }); + }); + + if (size (removed_packages) > 0) { + y2milestone ("%1 products were removed, reseting packager", size (removed_packages)); + ResetPackager(); + + foreach (string one_package, removed_packages, { + y2milestone ("Removed product package check: %1", Pkg::ResolvableProperties (one_package, `package, "")); + }); + } + + y2milestone ("Running registration"); + if (WFM::call ("inst_suse_register") == `abort) { + y2error ("Unable to register"); + return false; + } + + return true; + } + // main() HandleInit(); @@ -152,6 +284,12 @@ ret = ProductControl::RunFrom (current_step, false); } + // Wagon has been aborted, revert to the previous products + // if possible + if (ret == `abort || ret == `cancel) { + RevertToOldProducts(); + } + Wizard::CloseDialog(); HandleRet (ret); Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp Tue Jan 26 12:47:54 2010 @@ -0,0 +1,189 @@ +/** + * File: + * clients/wagon_migration_products.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + /** + * Selects and installs all migration products. + */ + + textdomain "wagon"; + + import "Wagon"; + import "PackagesUI"; + import "GetInstArgs"; + import "Report"; + import "Popup"; + import "Label"; + + include "wagon/common_func.ycp"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + integer UpdateInstalledProducts () { + integer affected_products = 0; + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + // Product is not installed + if (p["status"]:`unknown != `installed) return; + + // Make the logs readable + p["license"] = "..."; + p["description"] = "..."; + + string product_name = p["name"]:""; + string product_version = p["version"]:""; + + if (product_name == nil || product_name == "") { + y2error ("Cannot distinguish product name: %1", product_name); + return; + } + + // Product version is the same but release can be different + // product map doesn't contain the release string. To be sure, product will be reinstalled + y2milestone ("Upgrading product %1 version %2", product_name, product_version); + // The version is the same, release can be different + if (Pkg::ResolvableInstall (product_name, `product) != true) { + Report::Error (sformat(_("Cannot update installed product %1."), product_name)); + return; + } + + affected_products = affected_products + 1; + }); + + return affected_products; + } + + boolean FindAndSelectMigrationProducts () { + if (Wagon::InitPkg() != true) { + Report::Error (_("Unable to initialize the package manager.")); + return false; + } + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) { + y2milestone ("Product %1 (%2) is not installed, skipping...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + if (! haskey (p, "upgrades") || p["upgrades"]:[] == []) { + y2warning ("Product %1 (%2) does not contain 'upgrades' section...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + y2milestone ("Going to upgrade product %1 (%2)", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + + if (p["name"]:"" == nil || p["name"]:"" == "") { + y2error ("Product %1 doesn't have a name, reverting will be impossible", p); + Report::Error (sformat(_("Product %1 does not have a machine-readable 'name'. +Automatic reverting of the product state will be impossible."), p["short_name"]:p["display_name"]:"not-defined")); + } + + foreach (map <string, any> supported_upgrade, (list <map <string, any> >) p["upgrades"]:[], { + if (! haskey (supported_upgrade, "product") || supported_upgrade["product"]:"" == "") { + y2error ("Erroneous product upgrades: %1 (%2)", p, supported_upgrade); + Report::Error (sformat (_("Cannot upgrade product %1 (%2). +Migration path is erroneous."), p["display_name"]:p["short_name"]:_("Unknown"), p["name"]:_("not-defined"))); + return; + } + + string old_product = p["name"]:""; + string migration_product = supported_upgrade["product"]:""; + + // Install the migration product + if ((size (Pkg::ResolvableProperties (migration_product, `product, "")) == 0) || (Pkg::ResolvableInstall (migration_product, `product) != true)) { + y2error ("Cannot select migration product for installation: %1", Pkg::ResolvableProperties (migration_product, `product, "")); + Report::Error (sformat (_("Cannot select product +%1 (%2) for installation."), supported_upgrade["name"]:"", migration_product)); + return; + } else { + Wagon::migration_products = add (Wagon::migration_products, migration_product); + } + +// Old products are removed automatically during the upgrade +// // Remove the old product +// if ((Pkg::ResolvableInstalled (old_product, `product) != true) || (Pkg::ResolvableRemove (migration_product, `product) == true)) { +// Report::Error (sformat (_("Cannot select product %1 for deinstallation."), migration_product)); +// return; +// } + }); + }); + + return true; + } + + Wagon::InitPkg(); + + Wagon::ReadProductsBeforeMigration(); + Wagon::StoreProductsBeforeMigration(); + + // BNC #573084: New code (upgrading products) can be added after + // wagon self-upgrade and restart + integer products_for_upgrade = UpdateInstalledProducts(); + + if (products_for_upgrade > 0) { + symbol ret = SolveDependencies(); + + if (ret != `abort && ret != `cancel) { + y2milestone ("Upgrading %1 product packages...", products_for_upgrade); + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Product package upgrade returned: %1", inst_ret); + ret = `auto; + } else { + return `abort; + } + + ResetPackager(); + } else { + y2warning ("No products selected for upgrade"); + } + + if (FindAndSelectMigrationProducts() != true) { + return `auto; + } + + symbol ret = SolveDependencies(); + + if (ret != `abort && ret != `cancel) { + // Solver ends with some resolvables changed + if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { + y2milestone ("Installing packages..."); + // Everybody hold your breath 'cause we're gonna be sinkin' soon + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Package installation returned: %1", inst_ret); + ret = `auto; + } else { + y2milestone ("Nothing to install/remove"); + ret = `auto; + } + } + + ResetPackager(); + + y2milestone ("Returning: %1", ret); + + return ret; +} Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_point_of_no_return.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_point_of_no_return.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_point_of_no_return.ycp Tue Jan 26 12:47:54 2010 @@ -0,0 +1,39 @@ +/** + * File: + * clients/wagon_custom_url.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + textdomain "wagon"; + + import "GetInstArgs"; + import "Wagon"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + /** + * Point of no return. After this call, YaST will start removing + * and installing packages. In other words, the real migration + * will start. + */ + + y2warning ("From this point, wagon cannot revert products anymore!"); + Wagon::abort_can_revert_products = false; + + return `auto; +} Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_selfupdate.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_selfupdate.ycp Tue Jan 26 12:47:54 2010 @@ -28,20 +28,15 @@ import "Popup"; import "Label"; import "PackagesUI"; + import "Report"; + + include "wagon/common_func.ycp"; if (GetInstArgs::going_back()) { y2milestone ("Going back..."); return `back; } - boolean SolverRunWithFeedback () { - UI::OpenDialog (`Label (_("Solving the package dependencies..."))); - boolean ret = Pkg::PkgSolve (false); - UI::CloseDialog(); - - return ret; - } - /** * Tries to upgrade packages got as parameter. * @@ -142,9 +137,6 @@ Wagon::InitPkg(); - list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); - y2milestone ("All known products: %1", products); - symbol ret = `auto; // Patches need solver run @@ -174,65 +166,9 @@ return ret; } - boolean solved = nil; - - while (solved != true) { - // Trying to solve automatically - solved = SolverRunWithFeedback(); - symbol ret_sel = nil; - - // PkgSolve didn't report any problem - if (solved) { - y2milestone ("Solved automatically"); - // FIXME: inform user? - ret = `restart_same_step; - // There are some issues in selecting the patches - } else { - y2milestone ("Cannot be solved automatically"); - while (true) { - // Try to solve them manually - ret_sel = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); - - // Cannot or don't want to accept the proposal - if (ret_sel == `cancel) { - // Confirmed - if (Popup::AnyQuestion ( - // TRANSLATORS: headline - _("Aborting the Upgrade"), - // TRANSLATORS: pop-up question - _("Cannot continue without installing the required patches. -Are sure you want to abort the upgrade process?"), - _("Abort Upgrade"), - Label::NoButton(), - `yes_button - )) { - ret = `abort; - break; - // Try again - } else { - continue; - } - // Solved manually - } else if (ret_sel == `accept) { - solved = true; - break; - } - } - } - - if (ret == `abort) { - solved = nil; - y2warning ("Aborting..."); - break; - } - - if (! Wagon::AcceptLicenses()) { - y2warning ("Some license(s) have been rejected, running solver again"); - solved = nil; - } - } + ret = SolveDependencies(); - if (solved == true) { + if (ret != `abort) { // Solver ends with some resolvables changed if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { y2milestone ("Calling update..."); Modified: branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml Tue Jan 26 12:47:54 2010 @@ -29,8 +29,10 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module> <module>suse_register_workflow</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -52,12 +54,14 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -77,10 +81,12 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -100,11 +106,13 @@ <modules config:type="list"> <module>welcome</module> <module>update_online_mechanism</module> + <module>install_migration_products</module>  <module>update_url_dialog</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -126,6 +134,7 @@ <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> <module>prepare_progress</module> + <module>point_of_no_return</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -198,16 +207,22 @@ <enable_back>no</enable_back> </module> -  +  <module> <label>Renew Update Stack</label> <name>update_online_mechanism</name> <execute>wagon_selfupdate</execute> </module> +  + <module> + <label>Migration Configuration</label> + <name>install_migration_products</name> + <execute>wagon_migration_products</execute> + </module> +  <module> - <label>Renew Update Stack</label> <name>update_url_dialog</name> <execute>wagon_update_url</execute> </module> @@ -218,7 +233,6 @@ (*) Offered in wagon_update_url if not running via applet --> <module> - <label>Renew Update Stack</label> <name>suse_register_workflow</name> <execute>inst_suse_register</execute> </module> @@ -228,7 +242,6 @@ (*) Offered in wagon_update_url if not running via applet --> <module> - <label>Renew Update Stack</label> <name>wagon_custom_url</name> <execute>wagon_custom_url</execute> </module> @@ -238,7 +251,6 @@ Follows the wagon_ownurl --> <module> - <label>Renew Update Stack</label> <name>wagon_selfupdate_from_url</name> <execute>wagon_selfupdate</execute> </module> @@ -265,6 +277,12 @@ <execute>inst_prepareprogress</execute> </module> +  + <module> + <name>point_of_no_return</name> + <execute>wagon_point_of_no_return</execute> + </module> + <module> <name>wagon_kickoff</name> <execute>inst_kickoff</execute> Added: branches/SuSE-Code-11-Branch/wagon/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/include/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/wagon/src/include/Makefile.am Tue Jan 26 12:47:54 2010 @@ -0,0 +1,13 @@ +# +# Makefile.am for wagon/src/include +# + +yncludedir = @yncludedir@/wagon + +ynclude_DATA = $(wildcard *.ycp) + +YCPCFLAGS = -M ../modules + +EXTRA_DIST = $(ynclude_DATA) + +include $(top_srcdir)/Makefile.am.common Added: branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp Tue Jan 26 12:47:54 2010 @@ -0,0 +1,128 @@ +/** + * File: + * include/wagon/common_func.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + textdomain "wagon"; + + import "Label"; + import "Popup"; + import "PackagesUI"; + import "Wagon"; + import "Wizard"; + + boolean SolverRunWithFeedback () { + UI::OpenDialog (`Label (_("Solving the package dependencies..."))); + boolean ret = Pkg::PkgSolve (true); + UI::CloseDialog(); + + return ret; + } + + symbol SolveDependencies () { + symbol ret = `auto; + + boolean solved = nil; + + while (solved != true) { + // Trying to solve automatically + solved = SolverRunWithFeedback(); + symbol ret_sel = nil; + + // PkgSolve didn't report any problem + if (solved == true) { + y2milestone ("Solved automatically"); + ret = `auto; + // There are some issues in selecting the patches + } else { + y2milestone ("Cannot be solved automatically"); + while (true) { + // Try to solve them manually + ret_sel = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); + + // Cannot or don't want to accept the proposal + if (ret_sel == `cancel) { + // Confirmed + if (Popup::AnyQuestion ( + // TRANSLATORS: headline + _("Aborting the Upgrade"), + // TRANSLATORS: pop-up question + _("Cannot continue without installing the required patches. +Are sure you want to abort the upgrade process?"), + _("Abort Upgrade"), + Label::NoButton(), + `yes_button + )) { + ret = `abort; + break; + // Try again + } else { + continue; + } + // Solved manually + } else if (ret_sel == `accept) { + ret = `auto; + solved = true; + break; + } + } + } + + if (ret == `abort) { + solved = nil; + y2warning ("Aborting..."); + break; + } + + if (! Wagon::AcceptLicenses()) { + y2warning ("Some license(s) have been rejected, running solver again"); + solved = nil; + } + } + + return ret; + } + + void ResetPackager () { + Wizard::SetContents ( + _("Reseting Package Manager"), + `Label(_("Reseting package manager...")), + "", + false, true + ); + + y2milestone ("Reseting Pkg"); + Pkg::PkgApplReset(); + Pkg::PkgReset(); + + symbol status = nil; + string name = nil; + + y2milestone ("Neutralizing all resolvables"); + foreach (symbol resolvable, [`pattern, `patch, `package, `product, `scrpackage], { + Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); + }); + + y2milestone ("Running solver"); + Pkg::PkgSolve (true); + + Pkg::TargetFinish(); + Pkg::SourceFinishAll(); + + Wagon::InitPkg(); + Pkg::PkgSolve (true); + } +} Modified: branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Tue Jan 26 12:47:54 2010 @@ -29,11 +29,23 @@ import "Report"; import "ProductFeatures"; import "Update"; + import "FileUtils"; + import "String"; boolean running_by_applet = false; string update_workflow_type = "manual"; + // Products installed for the time of the migration + global list <string> migration_products = []; + + // Products installed before the migration + global list <map <string, string> > products_before_migration = []; + + // When aborting before the real migration starts, we can still + // revert to the old products + global boolean abort_can_revert_products = true; + global void SetUpdateWorkflow (string new_update_workflow_type) { // FIXME: check @@ -275,17 +287,192 @@ return true; } + global map <string,any> MinimizeProductMap (map <string,any> product) { + if (haskey (product, "license")) product["license"] = "..."; + if (haskey (product, "description")) product["description"] = "..."; + + return product; + } + + string GetDisplayName (string display_name, string name) { + if (display_name == name) + return display_name; + + // 'Product Long Name (product-libzypp-name)' + return sformat (_("%1 (%2)"), display_name, name); + } + + string GetDistributionUpgradeSummary () { + string ret = ""; + + list <map <string,any> > products = sort ( + map <string,any> x, map <string,any> y, Pkg::ResolvableProperties ("", `product, ""), + ``(x["display_name"]:x["short_name"]:x["name"]:"a" < y["display_name"]:x["short_name"]:x["name"]:"b") + ); + + // migration_products contains list of temporary products for migration process + + y2milestone ("All known migration products: %1", migration_products); + + string display_name = nil; + string name = nil; + + // list of all products that will be installed (are selected) + list <string> products_to_be_installed = []; + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `selected) return; + name = product["name"]:_("No short name defined"); + products_to_be_installed = add (products_to_be_installed, name); + }); + + // list of all products that will be upgraded + list <string> products_to_be_upgraded = []; + + // Products that are going to be removed + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `removed) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + // Removing product and installing the same one (name) means -> upgrade + if (contains (products_to_be_installed, name)) { + products_to_be_upgraded = add (products_to_be_upgraded, name); + y2milestone ("Product to be upgraded: %1 (this is the removed one)", product); + // Do not list this product as 'to removed', list it as 'to upgrade' + return; + } + + // Removing a migration product is fine + if (contains (migration_products, product["name"]:"")) { + y2milestone ("Migration product will be removed: %1", product); + ret = ret + "<li>" + sformat ( + _("Temporary migration product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Removing another product might be an issue + } else { + y2warning ("Product will be removed: %1", product); + ret = ret + "<li>" + sformat ( + _("Warning: Product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + } + }); + + // Products that are going to be installed (new ones) or upgraded + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `selected) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + // Product is going to be upgraded (removed + installed new version) + if (contains (products_to_be_upgraded, name)) { + y2milestone ("Product will be upgraded to: %1 (this is the installed one)", product); + ret = ret + "<li>" + sformat ( + _("Product %1 will be upgraded"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Newly installed product + } else { + y2milestone ("Product will be upgraded: %1", product); + ret = ret + "<li>" + sformat ( + _("New product %1 will be installed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + } + }); + + // Products that will keep installed (unchanged) + foreach (map <string,any> product, products, { + if (product["status"]:`unknown != `installed) return; + + product = MinimizeProductMap (product); + display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); + name = product["name"]:_("No short name defined"); + + y2milestone ("Product will keep: %1", product); + ret = ret + "<li>" + sformat ( + _("Product %1 will keep installed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + }); + + return "<ul>\n" + ret + "</ul>\n"; + } + global map <string, any> ProposalSummary () { map <string, any> ret = $[]; - // FIXME: create a useful summary ret = $[ - "preformatted_proposal" : "<ul><li>" + _("Distribution Upgrade") + "</li></ul>", - "help" : _("FIXME"), + "preformatted_proposal" : GetDistributionUpgradeSummary(), + // help text + "help" : _("To change update settings go to Software Proposal section."), ]; return ret; } + global list <map <string, string> > ReadProductsBeforeMigration () { + list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); + y2milestone ("All known products: %1", products); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) + return; + + // Remember the 'old' product just for the case of reverting + products_before_migration = add ( + products_before_migration, + $["name" : p["name"]:"", "version" : p["version"]:""] + ); + }); + + return products_before_migration; + } + + // YaST can be restarted but some data have to be kept + string migration_products_store_file = sformat ("%1/wagon_products_before_migration", Directory::vardir); + + global boolean StoreProductsBeforeMigration () { + return (boolean) SCR::Write (.target.ycp, migration_products_store_file, products_before_migration); + } + + global boolean RestoreProductsBeforeMigration () { + products_before_migration = (list <map <string, string> >) SCR::Read (.target.ycp, migration_products_store_file); + + if (products_before_migration == nil) { + products_before_migration = []; + Report::Error (_("Error restoring the list of previously installed products.")); + return false; + } + + return true; + } + + global string GetFileOwner (string file) { + if (file == nil || file == "") { + y2error ("File not provided"); + return nil; + } + + if (! FileUtils::Exists (file)) { + y2error ("File %1 doesn't exist", file); + return nil; + } + + string command = sformat ("rpm -qf '%1'", String::Quote (file)) + " --queryformat \"%{NAME}\""; + map <string, any> cmd = (map <string, any>) SCR::Execute (.target.bash_output, command); + if (cmd["exit"]:-1 != 0) { + y2error ("Cannot get file owner %1: %2", command, cmd); + return nil; + } + + return (string) splitstring (cmd["stdout"]:"", "\n")[0]:nil; + } + /* EOF */ } Modified: branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/yas… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Tue Jan 26 12:47:54 2010 @@ -4,6 +4,8 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 +# <upgrades> section from product file +Requires: yast2-pkg-bindings >= 2.17.39.2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update @@ -36,6 +38,8 @@ @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc +%dir @yncludedir@/wagon +@yncludedir@/wagon/*.ycp %dir /usr/share/YaST2/control @desktopdir@/*.desktop /usr/share/YaST2/control/*.xml -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60531 - /branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp
by kmachalkova＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: kmachalkova Date: Tue Jan 26 11:29:53 2010 New Revision: 60531 URL: http://svn.opensuse.org/viewcvs/yast?rev=60531&view=rev Log: delayed writing Modified: branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/installation/inst_hostname.ycp Tue Jan 26 11:29:53 2010 @@ -59,7 +59,10 @@ { // do not let Lan override us, #152218 DNS::proposal_valid = true; - DNS::Write (); // handles NetworkConfig too + + // delay writing, write along with the rest of network configuration + // in lan_proposal + // DNS::Write (); } return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60530 - in /branches/SuSE-Code-11-SP1-Branch/network/src: modules/DNS.ycp services/dns.ycp
by kmachalkova＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: kmachalkova Date: Tue Jan 26 11:13:37 2010 New Revision: 60530 URL: http://svn.opensuse.org/viewcvs/yast?rev=60530&view=rev Log: Set modified flag for DNS settings correctly Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp Tue Jan 26 11:13:37 2010 @@ -70,7 +70,7 @@ if (ns == "" || ns == nil) return false; nameservers = [ ns ]; - modified = true; + //modified = true; return true; } @@ -85,7 +85,7 @@ return false; hostname = hn; domain = dn; - modified = true; + //modified = true; return true; } Modified: branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp Tue Jan 26 11:13:37 2010 @@ -47,6 +47,11 @@ boolean resolver_modifiable = false; /** + * original setup, used to determine whether data have been modified + */ +map settings_orig = $[]; + +/** * CWM buffer for both dialogs. Note that NAMESERVERS and SEARCHLIST * are lists and their widgets are suffixed. */ @@ -87,6 +92,8 @@ settings["NAMESERVER_2"] = DNS::nameservers[1]:""; settings["NAMESERVER_3"] = DNS::nameservers[2]:""; + settings_orig = settings; + return settings; } @@ -110,8 +117,8 @@ DNS::write_hostname = settings["WRITE_HOSTNAME"]:true; /* update modified flag */ - DNS::modified = true; - y2milestone("modified DNS"); + DNS::modified = DNS::modified || (settings != settings_orig); + y2milestone("Modified DNS: %1", DNS::modified ); } /** @@ -329,6 +336,7 @@ has_dhcp = Lan::AnyDHCPDevice (); hn_settings = InitSettings (); + foreach(string key, (list<string>)Map::Keys(hn_settings),{ InitHnWidget(key); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60529 - /tags/stable-2_19_0/theme/
by jsrain＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: jsrain Date: Tue Jan 26 08:01:46 2010 New Revision: 60529 URL: http://svn.opensuse.org/viewcvs/yast?rev=60529&view=rev Log: Created tag stable-2_19_0 for theme Added: tags/stable-2_19_0/theme/ - copied from r60528, trunk/theme/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60528 - in /trunk/theme: VERSION package/yast2-theme.changes
by jsrain＠svn.opensuse.org 26 Jan '10

26 Jan '10

Author: jsrain Date: Tue Jan 26 07:58:18 2010 New Revision: 60528 URL: http://svn.opensuse.org/viewcvs/yast?rev=60528&view=rev Log: bump Modified: trunk/theme/VERSION trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=60528&r1=60527… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Tue Jan 26 07:58:18 2010 @@ -1 +1 @@ -2.18.11 +2.19.0 Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Tue Jan 26 07:58:18 2010 @@ -2,6 +2,7 @@ Fri Jan 15 13:27:26 CET 2010 - jsrain(a)suse.cz - added icons for the LXDE pattern +- 2.19.0 ------------------------------------------------------------------- Wed Dec 2 19:29:14 CET 2009 - jimmac(a)novell.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60527 - /tags/stable-2_19_2/product-creator/
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:03:14 2010 New Revision: 60527 URL: http://svn.opensuse.org/viewcvs/yast?rev=60527&view=rev Log: Created tag stable-2_19_2 for product-creator Added: tags/stable-2_19_2/product-creator/ - copied from r60526, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60526 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/dialogs.ycp src/kiwi_dialogs.ycp src/routines.ycp
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:03:05 2010 New Revision: 60526 URL: http://svn.opensuse.org/viewcvs/yast?rev=60526&view=rev Log: - when package cannot be installed, look if it is not provided by something else (bnc#571694) - if primary tag for the boot images is not defined, take the first one (bnc#572727) - 2.19.2 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/dialogs.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/routines.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6052… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Mon Jan 25 20:03:05 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Mon Jan 25 20:03:05 2010 @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 25 19:41:02 CET 2010 - jsuchome(a)suse.cz + +- when package cannot be installed, look if it is not provided + by something else (bnc#571694) +- if primary tag for the boot images is not defined, take the first + one (bnc#572727) +- 2.19.2 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Mon Jan 25 20:03:05 2010 @@ -1342,7 +1342,20 @@ { foreach(string p, packages, { - y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p)); + boolean selected = Pkg::PkgInstall(p); + y2milestone("selecting package for installation: %1 -> %2", p, selected); + if (!selected) + { + list <list> provides = Pkg::PkgQueryProvides (p); + provides = filter (list l, provides, { + return l[1]:`NONE != `NONE; + }); + string pp = provides[0,0]:""; + if (pp != "") + { + y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); + } + } }); } Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Mon Jan 25 20:03:05 2010 @@ -2075,14 +2075,12 @@ UI::ChangeWidget(`id(`out_dir), `Value, Config["iso-directory"]:""); update_repo_table (); list type_its = supported_images != "template" ? default_type_items: []; - boolean primary = false; + kiwi_task = ""; foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { string type = typemap[content_key]:""; - if (!primary) + if (typemap["primary"]:"false" == "true" || kiwi_task == "") kiwi_task = type; - if (typemap["primary"]:"false" == "true") - primary = true; if ((supported_images == "" && !contains (present_types, type)) || supported_images == "template") { @@ -2091,6 +2089,11 @@ present_types = union (present_types, [type]); } }); + if (kiwi_task == "") + { + kiwi_task = "iso"; + y2warning ("no task found, setting to 'iso'"); + } UI::ChangeWidget (`id (`type), `Items, type_its); UI::ChangeWidget (`id (`type), `Value, kiwi_task); return true; Modified: trunk/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/routines.ycp… ============================================================================== --- trunk/product-creator/src/routines.ycp (original) +++ trunk/product-creator/src/routines.ycp Mon Jan 25 20:03:05 2010 @@ -38,12 +38,20 @@ // get the primary value of image type to be built ('type' from 'preferences') string get_current_task (map config) { - string task = "iso"; + string task = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { - task = typemap[Kiwi::content_key]:task; + if (task == "") // take the 1st one if none is default + task = typemap[Kiwi::content_key]:task; if (typemap["primary"]:"false" == "true") + { + task = typemap[Kiwi::content_key]:task; break; + } }); + if (task == "") + { + y2milestone ("no task found, setting to 'iso'"); + } return task; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0