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

[yast-commit] r60525 - /tags/branch-Code-11-SP1-2_17_28/product-creator/
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:02:56 2010 New Revision: 60525 URL: http://svn.opensuse.org/viewcvs/yast?rev=60525&view=rev Log: Created tag branch-Code-11-SP1-2_17_28 for product-creator Added: tags/branch-Code-11-SP1-2_17_28/product-creator/ (props changed) - copied from r60524, branches/SuSE-Code-11-SP1-Branch/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] r60524 - /tags/branch-Code-11-SP1-2_17_28/
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:02:51 2010 New Revision: 60524 URL: http://svn.opensuse.org/viewcvs/yast?rev=60524&view=rev Log: Created tag branch-Code-11-SP1-2_17_28 Added: tags/branch-Code-11-SP1-2_17_28/ -- 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] r60523 - in /branches/SuSE-Code-11-SP1-Branch/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:02:45 2010 New Revision: 60523 URL: http://svn.opensuse.org/viewcvs/yast?rev=60523&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.17.28 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION Mon Jan 25 20:02:45 2010 @@ -1 +1 @@ -2.17.27 +2.17.28 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon Jan 25 20:02:45 2010 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Jan 25 19:39:12 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.17.28 + +------------------------------------------------------------------- Tue Dec 22 15:43:41 CET 2009 - jsuchome(a)suse.cz - use menubutton for both iso image and directory tree (bnc#438223) Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp Mon Jan 25 20:02:45 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: branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Mon Jan 25 20:02:45 2010 @@ -2078,14 +2078,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") { @@ -2094,6 +2092,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: branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp Mon Jan 25 20:02:45 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

[yast-commit] r60522 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 17:32:59 2010 New Revision: 60522 URL: http://svn.opensuse.org/viewcvs/yast?rev=60522&view=rev Log: - fixed default mount-by for multipath (bnc #572209) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Mon Jan 25 17:32:59 2010 @@ -2523,11 +2523,33 @@ mby = defaultMountBy; pair<string,unsigned> dp = Disk::getDiskPartition(device); y2mil( "dp:" << dp ); - DiskIterator i = findDisk( dp.first ); - if( (i==dEnd()) || (mby == MOUNTBY_ID && i->udevId().empty()) || - (mby == MOUNTBY_PATH && i->udevPath().empty())) - mby = MOUNTBY_DEVICE; - ret = STORAGE_VOLUME_NOT_FOUND; + + DiskIterator i1 = findDisk(dp.first); + DmPartCoIterator i2 = findDmPartCo(dp.first); + MdPartCoIterator i3 = findMdPartCo(dp.first); + + if (i1 != dEnd()) + { + if ((mby == MOUNTBY_ID && i1->udevId().empty()) || + (mby == MOUNTBY_PATH && i1->udevPath().empty())) + mby = MOUNTBY_DEVICE; + } + else if (i2 != dmpCoEnd()) + { + if ((mby == MOUNTBY_ID && i2->udevId().empty()) || + (mby == MOUNTBY_PATH && i2->udevPath().empty())) + mby = MOUNTBY_DEVICE; + } + else if (i3 != mdpCoEnd()) + { + if ((mby == MOUNTBY_ID && i3->udevId().empty()) || + (mby == MOUNTBY_PATH && i3->udevPath().empty())) + mby = MOUNTBY_DEVICE; + } + else + { + ret = STORAGE_VOLUME_NOT_FOUND; + } } y2milestone( "ret:%d mby:%s", ret, Volume::mbyTypeString(mby).c_str()); return( ret ); Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Jan 25 17:32:59 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 25 17:30:26 CET 2010 - aschnell(a)suse.de + +- fixed default mount-by for multipath (bnc #572209) + +------------------------------------------------------------------- Mon Jan 25 14:12:51 CET 2010 - aschnell(a)suse.de - fixed generation of device names in proposal for partitionable -- 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] r60521 - /trunk/wagon/yast2-wagon.spec.in
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:16:34 2010 New Revision: 60521 URL: http://svn.opensuse.org/viewcvs/yast?rev=60521&view=rev Log: More explicit RPM requirements Modified: trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=60… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Mon Jan 25 17:16:34 2010 @@ -6,6 +6,8 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 +# BNC #571621, Returns <upgrades> section from product file +Requires: yast2-pkg-bindings >= 2.19.1 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- 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] r60520 - /branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:14:08 2010 New Revision: 60520 URL: http://svn.opensuse.org/viewcvs/yast?rev=60520&view=rev Log: More explicit RPM requirements Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Mon Jan 25 17:14:08 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.44 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- 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] r60519 - /tags/branch-Code-11-SP1-2_17_10/samba-server/
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:03:58 2010 New Revision: 60519 URL: http://svn.opensuse.org/viewcvs/yast?rev=60519&view=rev Log: Created tag branch-Code-11-SP1-2_17_10 for samba-server Added: tags/branch-Code-11-SP1-2_17_10/samba-server/ (props changed) - copied from r60518, branches/SuSE-Code-11-SP1-Branch/samba-server/ -- 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] r60518 - in /branches/SuSE-Code-11-SP1-Branch/samba-server: VERSION package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:03:24 2010 New Revision: 60518 URL: http://svn.opensuse.org/viewcvs/yast?rev=60518&view=rev Log: - Import sets Modified to true (BNC #572670). - 2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION Mon Jan 25 17:03:24 2010 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes Mon Jan 25 17:03:24 2010 @@ -1,3 +1,9 @@ +----------------------------------------------------------------- +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). +- 2.17.10 + ------------------------------------------------------------------- Mon Mar 30 15:58:03 CEST 2009 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm Mon Jan 25 17:03:24 2010 @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", -- 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] r60517 - in /branches/SuSE-Code-11-Branch/samba-server: package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:02:48 2010 New Revision: 60517 URL: http://svn.opensuse.org/viewcvs/yast?rev=60517&view=rev Log: - Import sets Modified to true (BNC #572670). Modified: branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/samba-ser… ============================================================================== --- branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes Mon Jan 25 17:02:48 2010 @@ -1,3 +1,8 @@ +----------------------------------------------------------------- +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). + ------------------------------------------------------------------- Mon Mar 30 15:58:03 CEST 2009 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/samba-ser… ============================================================================== --- branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm Mon Jan 25 17:02:48 2010 @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", -- 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] r60516 - in /trunk/samba-server: package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:01:54 2010 New Revision: 60516 URL: http://svn.opensuse.org/viewcvs/yast?rev=60516&view=rev Log: - Import sets Modified to true (BNC #572670). Modified: trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/SambaServer.pm Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Mon Jan 25 17:01:54 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------ +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). + +------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/SambaServer.pm?… ============================================================================== --- trunk/samba-server/src/SambaServer.pm (original) +++ trunk/samba-server/src/SambaServer.pm Mon Jan 25 17:01:54 2010 @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", -- 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] r60515 - /tags/branch-Code-11-SP1-2_17_8/backup/
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:44:03 2010 New Revision: 60515 URL: http://svn.opensuse.org/viewcvs/yast?rev=60515&view=rev Log: Created tag branch-Code-11-SP1-2_17_8 for backup Added: tags/branch-Code-11-SP1-2_17_8/backup/ (props changed) - copied from r60514, branches/SuSE-Code-11-SP1-Branch/backup/ -- 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] r60514 - in /branches/SuSE-Code-11-Branch/backup: package/yast2-backup.changes src/ui.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:42:29 2010 New Revision: 60514 URL: http://svn.opensuse.org/viewcvs/yast?rev=60514&view=rev Log: - Fixed low speed of automatic backup (BNC #568615). Modified: branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes branches/SuSE-Code-11-Branch/backup/src/ui.ycp Modified: branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/backup/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes Mon Jan 25 16:42:29 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 25 16:36:47 CET 2010 - locilka(a)suse.cz + +- Fixed low speed of automatic backup (BNC #568615). + +------------------------------------------------------------------- Wed Dec 2 15:41:11 CET 2009 - locilka(a)suse.cz - Fixed infinite loop in case of old archives to keep set to zero Modified: branches/SuSE-Code-11-Branch/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/backup/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/backup/src/ui.ycp (original) +++ branches/SuSE-Code-11-Branch/backup/src/ui.ycp Mon Jan 25 16:42:29 2010 @@ -181,7 +181,7 @@ if ((boolean) SCR::Read (.process.running, backup_PID)) { - sleep(wait); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait); ret = (symbol) UI::PollInput(); @@ -1956,7 +1956,8 @@ } if (Backup::cron_mode) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } else { @@ -2073,7 +2074,8 @@ if (Backup::cron_mode == true) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } @@ -2826,7 +2828,7 @@ if (Backup::cron_mode) { ret = nil; - sleep(wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); CheckFreeSpace(); } else { ret = waitForUserOrProcess(wait_time, `changed); -- 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] r60513 - in /branches/SuSE-Code-11-SP1-Branch/backup: VERSION package/yast2-backup.changes src/ui.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:41:55 2010 New Revision: 60513 URL: http://svn.opensuse.org/viewcvs/yast?rev=60513&view=rev Log: - Fixed low speed of automatic backup (BNC #568615). - 2.17.8 Modified: branches/SuSE-Code-11-SP1-Branch/backup/VERSION branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp Modified: branches/SuSE-Code-11-SP1-Branch/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/VERSION Mon Jan 25 16:41:55 2010 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes Mon Jan 25 16:41:55 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 25 16:36:47 CET 2010 - locilka(a)suse.cz + +- Fixed low speed of automatic backup (BNC #568615). +- 2.17.8 + +------------------------------------------------------------------- Mon Dec 7 11:27:04 CET 2009 - locilka(a)suse.cz - Fixed RPM dependencies Modified: branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp Mon Jan 25 16:41:55 2010 @@ -181,7 +181,7 @@ if ((boolean) SCR::Read (.process.running, backup_PID)) { - sleep(wait); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait); ret = (symbol) UI::PollInput(); @@ -1956,7 +1956,8 @@ } if (Backup::cron_mode) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } else { @@ -2073,7 +2074,8 @@ if (Backup::cron_mode == true) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } @@ -2826,7 +2828,7 @@ if (Backup::cron_mode) { ret = nil; - sleep(wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); CheckFreeSpace(); } else { ret = waitForUserOrProcess(wait_time, `changed); -- 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] r60512 - in /trunk/backup: package/yast2-backup.changes src/ui.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:39:07 2010 New Revision: 60512 URL: http://svn.opensuse.org/viewcvs/yast?rev=60512&view=rev Log: - Fixed low speed of automatic backup (BNC #568615). Modified: trunk/backup/package/yast2-backup.changes trunk/backup/src/ui.ycp Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Mon Jan 25 16:39:07 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------ +Mon Jan 25 16:36:47 CET 2010 - locilka(a)suse.cz + +- Fixed low speed of automatic backup (BNC #568615). + +------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/ui.ycp?rev=60512&r1=6… ============================================================================== --- trunk/backup/src/ui.ycp (original) +++ trunk/backup/src/ui.ycp Mon Jan 25 16:39:07 2010 @@ -181,7 +181,7 @@ if (backup_PID != nil && (boolean) SCR::Read (.process.running, backup_PID)) { - sleep(wait); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait); ret = (symbol) UI::PollInput(); @@ -1950,7 +1950,7 @@ } if (Backup::cron_mode) { - sleep (wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep (wait_time); } else { ret = UI::PollInput(); @@ -1966,7 +1966,7 @@ } if (line == nil && errline == nil) - sleep (ui_wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep (ui_wait_time); } } @@ -2093,7 +2093,8 @@ } if (Backup::cron_mode) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } else { @@ -2210,7 +2211,8 @@ if (Backup::cron_mode == true) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } @@ -2963,7 +2965,7 @@ if (Backup::cron_mode) { ret = nil; - sleep(wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); CheckFreeSpace(); } else { ret = waitForUserOrProcess(wait_time, `changed); -- 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] r60511 - in /branches/SuSE-Code-11-SP1-Branch/support: package/yast2-support.changes src/Support.ycp
by mzugec＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: mzugec Date: Mon Jan 25 15:39:42 2010 New Revision: 60511 URL: http://svn.opensuse.org/viewcvs/yast?rev=60511&view=rev Log: bnc#447588 - remove progress dialog on start of support module Modified: branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp Modified: branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/suppo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes Mon Jan 25 15:39:42 2010 @@ -2,6 +2,7 @@ Mon Jan 18 09:51:55 CET 2010 - mzugec(a)suse.cz - fixed desktop file (Categories) +- bnc#447588 - remove progress dialog on start of support module - 2.17.19 ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/suppo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp Mon Jan 25 15:39:42 2010 @@ -244,52 +244,20 @@ /* Support read dialog caption */ string caption = _("Initializing support Configuration"); - // TODO FIXME Set the right number of stages - integer steps = 2; - - integer sl = 500; - sleep(sl); - - // TODO FIXME Names of real stages - // We do not set help text here, because it was set outside - Progress::New( caption, " ", steps, [ - /* Progress stage 1/3 */ - _("Read the configuration") - ], [ - /* Progress step 1/3 */ - _("Reading the database..."), - /* Progress step 2/3 */ - _("Reading the previous settings..."), - /* Progress step 3/3 */ - _("Detecting the devices..."), - /* Progress finished */ - _("Finished") - ], - "" - ); - - // read database - if(Abort()) return false; - Progress::NextStage(); configuration = (map)SCR::Read(.etc.supportconfig.all); foreach(map<string, any> row, configuration["value"]:[], { options[row["name"]:""]=row["value"]:""; }); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); - sleep(sl); - // read current settings - if(Abort()) return false; - Progress::NextStage(); if (PackageSystem::Installed("MozillaFirefox")) browser="firefox"; else if (PackageSystem::Installed("kde4-konqueror")||PackageSystem::Installed("kdebase3")) browser="konqueror"; else if (PackageSystem::Installed("opera")) browser="opera"; else y2error("Couldn't find any supported browser installed."); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); - sleep(sl); if(Abort()) return false; log_files=$[ "tmp_dir":(string)SCR::Read(.target.tmpdir) ]; -- 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] r60510 - /tags/branch-Code-11-SP1-2_17_10/wagon/
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 15:37:16 2010 New Revision: 60510 URL: http://svn.opensuse.org/viewcvs/yast?rev=60510&view=rev Log: Created tag branch-Code-11-SP1-2_17_10 for wagon Added: tags/branch-Code-11-SP1-2_17_10/wagon/ (props changed) - copied from r60509, branches/SuSE-Code-11-SP1-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] r60509 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 15:35:45 2010 New Revision: 60509 URL: http://svn.opensuse.org/viewcvs/yast?rev=60509&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). Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon_migration_products.ycp trunk/wagon/src/clients/wagon_selfupdate.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Jan 25 15:35:45 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +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). + +------------------------------------------------------------------- Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz - Wagon extended to read and use migration products from the Modified: trunk/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_migratio… ============================================================================== --- trunk/wagon/src/clients/wagon_migration_products.ycp (original) +++ trunk/wagon/src/clients/wagon_migration_products.ycp Mon Jan 25 15:35:45 2010 @@ -36,6 +36,42 @@ 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.")); @@ -99,13 +135,39 @@ 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) { + 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..."); Modified: trunk/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_selfupda… ============================================================================== --- trunk/wagon/src/clients/wagon_selfupdate.ycp (original) +++ trunk/wagon/src/clients/wagon_selfupdate.ycp Mon Jan 25 15:35:45 2010 @@ -135,50 +135,8 @@ return pkgs_affected; } - 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; - } - Wagon::InitPkg(); - list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); - y2milestone ("All known products: %1", products); - - Wagon::ReadProductsBeforeMigration(); - Wagon::StoreProductsBeforeMigration(); - symbol ret = `auto; // Patches need solver run @@ -202,12 +160,6 @@ } } - integer products_selected_for_update = UpdateInstalledProducts(); - if (products_selected_for_update > 0) { - y2milestone ("%1 products were selected for update", products_selected_for_update); - selected = products_selected_for_update; - } - y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); -- 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] r60508 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 15:35:25 2010 New Revision: 60508 URL: http://svn.opensuse.org/viewcvs/yast?rev=60508&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). - 2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Mon Jan 25 15:35:25 2010 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Mon Jan 25 15:35:25 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +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.10 + +------------------------------------------------------------------- Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz - Wagon extended to read and use migration products from the Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp Mon Jan 25 15:35:25 2010 @@ -36,6 +36,42 @@ 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.")); @@ -99,13 +135,39 @@ 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) { + 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..."); Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp Mon Jan 25 15:35:25 2010 @@ -135,50 +135,8 @@ return pkgs_affected; } - 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; - } - Wagon::InitPkg(); - list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); - y2milestone ("All known products: %1", products); - - Wagon::ReadProductsBeforeMigration(); - Wagon::StoreProductsBeforeMigration(); - symbol ret = `auto; // Patches need solver run @@ -202,12 +160,6 @@ } } - integer products_selected_for_update = UpdateInstalledProducts(); - if (products_selected_for_update > 0) { - y2milestone ("%1 products were selected for update", products_selected_for_update); - selected = products_selected_for_update; - } - y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); -- 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] r60507 - /tags/branch-Code-11-SP1-2_17_89/storage/
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:34:39 2010 New Revision: 60507 URL: http://svn.opensuse.org/viewcvs/yast?rev=60507&view=rev Log: Created tag branch-Code-11-SP1-2_17_89 for storage Added: tags/branch-Code-11-SP1-2_17_89/storage/ (props changed) - copied from r60506, branches/SuSE-Code-11-SP1-Branch/storage/ -- 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] r60506 - /tags/branch-Code-11-SP1-2_17_89/
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:34:38 2010 New Revision: 60506 URL: http://svn.opensuse.org/viewcvs/yast?rev=60506&view=rev Log: Created tag branch-Code-11-SP1-2_17_89 Added: tags/branch-Code-11-SP1-2_17_89/ -- 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] r60505 - /branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:33:26 2010 New Revision: 60505 URL: http://svn.opensuse.org/viewcvs/yast?rev=60505&view=rev Log: - fixed bug number Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Jan 25 14:33:26 2010 @@ -2,7 +2,7 @@ Mon Jan 25 14:12:51 CET 2010 - aschnell(a)suse.de - fixed generation of device names in proposal for partitionable - MDs (bnc #573088) + MDs (bnc #573070) - 2.17.89 ------------------------------------------------------------------- -- 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] r60504 - in /branches/SuSE-Code-11-SP1-Branch/storage: VERSION package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:23:53 2010 New Revision: 60504 URL: http://svn.opensuse.org/viewcvs/yast?rev=60504&view=rev Log: - fixed generation of device names in proposal for partitionable MDs (bnc #573088) Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/VERSION Mon Jan 25 14:23:53 2010 @@ -1 +1 @@ -2.17.88 +2.17.89 Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Jan 25 14:23:53 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 25 14:12:51 CET 2010 - aschnell(a)suse.de + +- fixed generation of device names in proposal for partitionable + MDs (bnc #573088) +- 2.17.89 + +------------------------------------------------------------------- Tue Jan 19 17:49:33 CET 2010 - aschnell(a)suse.de - zero newly created partitions on DASDs (bnc #571828) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Mon Jan 25 14:23:53 2010 @@ -204,6 +204,7 @@ search( disk, "/dev/ida/" )==0 || search( disk, "/dev/ataraid/" )==0 || search( disk, "/dev/etherd/" )==0 || + (search(disk, "/dev/md") == 0 && disk != "/dev/md") || search( disk, "/dev/rd/" )==0 ) { ret = ret + "p"; -- 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] r60503 - /tags/branch-Code-11-SP1-2_17_33/autoinstallation/
by ug＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: ug Date: Mon Jan 25 12:54:12 2010 New Revision: 60503 URL: http://svn.opensuse.org/viewcvs/yast?rev=60503&view=rev Log: Created tag branch-Code-11-SP1-2_17_33 for autoinstallation Added: tags/branch-Code-11-SP1-2_17_33/autoinstallation/ (props changed) - copied from r60502, branches/SuSE-Code-11-SP1-Branch/autoinstallation/ -- 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] r60502 - in /branches/SuSE-Code-11-SP1-Branch/autoinstallation: VERSION package/autoyast2.changes
by ug＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: ug Date: Mon Jan 25 12:54:06 2010 New Revision: 60502 URL: http://svn.opensuse.org/viewcvs/yast?rev=60502&view=rev Log: 2.17.33 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION Mon Jan 25 12:54:06 2010 @@ -1 +1 @@ -2.17.32 +2.17.33 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Mon Jan 25 12:54:06 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 25 12:41:40 CET 2010 - ug(a)suse.de + +- 2.17.33 + +------------------------------------------------------------------- Fri Jan 22 11:49:06 CET 2010 - ug(a)suse.de - the regex match for rules only worked for substring, not -- 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] r60501 - /trunk/autoinstallation/doc/RulesAndClasses.xml
by ug＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: ug Date: Mon Jan 25 11:32:13 2010 New Revision: 60501 URL: http://svn.opensuse.org/viewcvs/yast?rev=60501&view=rev Log: docu update Modified: trunk/autoinstallation/doc/RulesAndClasses.xml Modified: trunk/autoinstallation/doc/RulesAndClasses.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/RulesAndCla… ============================================================================== --- trunk/autoinstallation/doc/RulesAndClasses.xml (original) +++ trunk/autoinstallation/doc/RulesAndClasses.xml Mon Jan 25 11:32:13 2010 @@ -269,7 +269,7 @@ </listitem> <listitem> <para> - regex (available since 10.1 and SLES10) + regex (available since 10.1 and SLES10). It's a simple "=~" operator like in bash </para> </listitem> </itemizedlist> @@ -858,6 +858,17 @@ <element>partition</element> </dont_merge> </result> + <board_vendor> + <match>PowerEdge [12]850</match> + <match_type>regex</match_type> + </board_vendor> + <result> + <profile>classes/smallswap.xml</profile> + <continue config:type="boolean">true</continue> + <dont_merge config:type="list"> + <element>partition</element> + </dont_merge> + </result> </rule> </screen> </para> -- 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] r60500 - /trunk/storage/storage/src/modules/FileSystems.ycp
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 11:01:22 2010 New Revision: 60500 URL: http://svn.opensuse.org/viewcvs/yast?rev=60500&view=rev Log: - simplified GetMountString and GetNeededModules Modified: trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Jan 25 11:01:22 2010 @@ -18,9 +18,7 @@ import "Arch"; import "String"; import "Partitions"; - import "Popup"; import "Encoding"; - import "Mode"; import "Stage"; import "LibStorage"; @@ -1018,38 +1016,22 @@ * Return the mount option for each used_fs (-t) * @return string */ - global define string GetMountString(symbol used_fs, string defaultv )``{ - map<symbol,any> fsmap = GetFsMap( used_fs); - string ret = fsmap[`mount_string ]:""; - if( size(ret)==0 ) - { - if( used_fs == `vfat ) - { - ret = "vfat"; - } - else if( used_fs == `ntfs ) - { - ret = "ntfs-3g"; - } - } - if( ret == "" ) ret = defaultv; - y2milestone( "used_fs:%1 ret:%2", used_fs, ret ); - return ret; - } + global string GetMountString(symbol used_fs, string defaultv) + { + map<symbol, any> fsmap = GetFsMap(used_fs); + string ret = fsmap[`mount_string ]:defaultv; + y2milestone("GetMountString used_fs:%1 ret:%2", used_fs, ret); + return ret; + } - global define list<string> GetNeededModules( symbol used_fs )``{ - list<string> ret = []; - map<symbol,any> fsmap = GetFsMap( used_fs); - if( used_fs==`ntfs && size(fsmap)==0 ) - { - ret = ["ntfs"]; - } - else - { - ret = fsmap[`needed_modules ]:[]; - } - return ret; - } + + global list<string> GetNeededModules(symbol used_fs) + { + map<symbol, any> fsmap = GetFsMap(used_fs); + list<string> ret = fsmap[`needed_modules ]:[]; + y2milestone("GetNeededModules used_fs:%1 ret:%2", used_fs, ret); + return ret; + } global integer MinFsSizeK(symbol fsys) -- 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] r60499 - in /trunk/installation: package/yast2-installation.changes startup/YaST2.ssh
by aschnell＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: aschnell Date: Fri Jan 22 15:57:59 2010 New Revision: 60499 URL: http://svn.opensuse.org/viewcvs/yast?rev=60499&view=rev Log: - fixed message during ssh installation (bnc #518616) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.ssh Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jan 22 15:57:59 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jan 22 15:56:07 CET 2010 - aschnell(a)suse.de + +- fixed message during ssh installation (bnc #518616) + +------------------------------------------------------------------- Fri Jan 15 17:29:45 CET 2010 - aschnell(a)suse.de - updated control.rnc Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?r… ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Fri Jan 22 15:57:59 2010 @@ -62,11 +62,15 @@ # running the second stage installation /usr/lib/YaST2/startup/YaST2.call installation continue - # second stage installation needs to reboot - if [ -f /var/lib/YaST2/reboot ]; then + if [ -f /etc/install.inf ] ; then + SecondStageRequired=$(awk ' /^SecondStageRequired:/ { print $2 }' < /etc/install.inf) + fi + + if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "1" ] ; then + # second stage installation needs to reboot reboot_during_second_stage - # second stage has just finished else + # second stage has just finished continue_after_second_stage fi else -- 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] r60498 - in /trunk/printer: VERSION package/yast2-printer.changes
by jsmeix＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsmeix Date: Fri Jan 22 15:39:33 2010 New Revision: 60498 URL: http://svn.opensuse.org/viewcvs/yast?rev=60498&view=rev Log: - Fixed search usability in basicadd.ycp and basicmodify.ycp in each run of the user input while loop before UI::UserInput() by first replacing the [Search for] button with itself with `opt(`default) to enforce this default regardless whatever function call or UI bug (see bnc#558900) may have changed it and then additionally but only when the user is already searching drivers, set the focus to the InputField for the search string so that the user can just type in another search string. In contrast when the user is not already searching drivers, it is annoying in particular in the text-only ncurses UI when the focus becomes always set to the search string InputField for each run of the user input while loop. - In basicadd.ycp and basicmodify.ycp re-rename the PushButton to launch the DriverAdd dialog from "Install Driver" to "Driver Packages" because the former can be confused by the user with the functionality what the [OK] button in basicadd.ycp and basicmodify.ycp does i.e. to install the print queue with the selected driver. - Improved help text 'regarding firewall' and added link to 'SDB:CUPS and SANE Firewall settings' at http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings - 2.19.4 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=60498&r1=604… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Jan 22 15:39:33 2010 @@ -1 +1 @@ -2.19.3 +2.19.4 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Fri Jan 22 15:39:33 2010 @@ -1,7 +1,41 @@ ------------------------------------------------------------------- +Fri Jan 22 15:23:18 CET 2010 - jsmeix(a)suse.de + +- Fixed search usability in basicadd.ycp and basicmodify.ycp + in each run of the user input while loop before UI::UserInput() + by first replacing the [Search for] button with itself + with `opt(`default) to enforce this default regardless + whatever function call or UI bug (see bnc#558900) + may have changed it and then additionally + but only when the user is already searching drivers, + set the focus to the InputField for the search string + so that the user can just type in another search string. + In contrast when the user is not already searching drivers, + it is annoying in particular in the text-only ncurses UI + when the focus becomes always set to the search string + InputField for each run of the user input while loop. +- In basicadd.ycp and basicmodify.ycp re-rename + the PushButton to launch the DriverAdd dialog + from "Install Driver" to "Driver Packages" + because the former can be confused by the user + with the functionality what the [OK] button + in basicadd.ycp and basicmodify.ycp does i.e. to + install the print queue with the selected driver. +- Improved help text 'regarding firewall' and + added link to 'SDB:CUPS and SANE Firewall settings' at + http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings +- 2.19.4 + +------------------------------------------------------------------- Tue Jan 19 16:21:03 CET 2010 - jsmeix(a)suse.de -- More meaningful wording in BasicAdd and BasicModify dialogs. +- More meaningful wording in BasicAdd and BasicModify dialogs + in particular the following PushButton renames: + From "More Connections" to "Detect More", + from "Search" to "Search for", + from "More Drivers" to "Find More", + from "Add Driver" to "Install Driver", + from "Set Name" to "Set Arbitrary Name". - 2.19.3 ------------------------------------------------------------------ -- 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] r60497 - in /trunk/storage: VERSION package/yast2-storage.changes yast2-storage.spec.in
by aschnell＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: aschnell Date: Fri Jan 22 14:30:13 2010 New Revision: 60497 URL: http://svn.opensuse.org/viewcvs/yast?rev=60497&view=rev Log: - increased version Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=60497&r1=604… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Jan 22 14:30:13 2010 @@ -1 +1 @@ -2.19.3 +2.19.4 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Jan 22 14:30:13 2010 @@ -2,6 +2,7 @@ Thu Jan 21 17:28:48 CET 2010 - aschnell(a)suse.de - implemented moving of newly created partitions (see bnc #541034) +- 2.19.4 ------------------------------------------------------------------- Tue Jan 19 14:14:26 CET 2010 - fehr(a)suse.de Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Fri Jan 22 14:30:13 2010 @@ -5,7 +5,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.5 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.6 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 -- 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] r60496 - /tags/branch-Code-11-SP1-2_17_88/storage/
by aschnell＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: aschnell Date: Fri Jan 22 14:23:27 2010 New Revision: 60496 URL: http://svn.opensuse.org/viewcvs/yast?rev=60496&view=rev Log: Created tag branch-Code-11-SP1-2_17_88 for storage Added: tags/branch-Code-11-SP1-2_17_88/storage/ (props changed) - copied from r60495, branches/SuSE-Code-11-SP1-Branch/storage/ -- 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] r60495 - /tags/branch-Code-11-SP1-2_17_88/
by aschnell＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: aschnell Date: Fri Jan 22 14:23:27 2010 New Revision: 60495 URL: http://svn.opensuse.org/viewcvs/yast?rev=60495&view=rev Log: Created tag branch-Code-11-SP1-2_17_88 Added: tags/branch-Code-11-SP1-2_17_88/ -- 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] r60494 - /tags/branch-Code-11-SP1-2_17_18/theme/
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:45:22 2010 New Revision: 60494 URL: http://svn.opensuse.org/viewcvs/yast?rev=60494&view=rev Log: Created tag branch-Code-11-SP1-2_17_18 for theme Added: tags/branch-Code-11-SP1-2_17_18/theme/ (props changed) - copied from r60493, branches/SuSE-Code-11-SP1-Branch/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] r60493 - /branches/SuSE-Code-11-SP1-Branch/theme/VERSION
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:42:55 2010 New Revision: 60493 URL: http://svn.opensuse.org/viewcvs/yast?rev=60493&view=rev Log: bump Modified: branches/SuSE-Code-11-SP1-Branch/theme/VERSION Modified: branches/SuSE-Code-11-SP1-Branch/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/theme/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/theme/VERSION Fri Jan 22 13:42:55 2010 @@ -1 +1 @@ -2.17.17 +2.17.18 -- 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] r60492 - in /branches/SuSE-Code-11-SP1-Branch/theme: openSUSE-Crystal/icons/22x22/apps/ openSUSE-Crystal/icons/32x32/apps/ openSUSE-Crystal/icons/48x48/apps/ openSUSE-Oxygen/icons/22x22/apps/ openS...
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:42:39 2010 New Revision: 60492 URL: http://svn.opensuse.org/viewcvs/yast?rev=60492&view=rev Log: added icons for openvas module (fate#307440) Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/22x22/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/32x32/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/48x48/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/22x22/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/32x32/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/48x48/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/16x16/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/22x22/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/32x32/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/48x48/apps/yast-openvas.png (with props) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/64x64/apps/yast-openvas.png (with props) Modified: branches/SuSE-Code-11-SP1-Branch/theme/package/yast2-theme.changes Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/22x22/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/32x32/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Crystal/icons/48x48/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/22x22/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/32x32/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/48x48/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/16x16/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/22x22/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/32x32/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/48x48/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Added: branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/icons/64x64/apps/yast-openvas.png URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== Binary file - no diff available. Modified: branches/SuSE-Code-11-SP1-Branch/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/theme… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/theme/package/yast2-theme.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/theme/package/yast2-theme.changes Fri Jan 22 13:42:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 22 13:11:08 CET 2010 - jsrain(a)suse.cz + +- added icons for openvas module (fate#307440) +- 2.17.18 + +------------------------------------------------------------------- Thu Jan 22 12:24:56 CET 2009 - jimmac(a)novell.com - set the SLE green for links (a) as well. bug #446588 -- 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] r60491 - /tags/branch-Code-11-SP1-2_17_9/wagon/
by locilka＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: locilka Date: Fri Jan 22 13:42:24 2010 New Revision: 60491 URL: http://svn.opensuse.org/viewcvs/yast?rev=60491&view=rev Log: Created tag branch-Code-11-SP1-2_17_9 for wagon Added: tags/branch-Code-11-SP1-2_17_9/wagon/ (props changed) - copied from r60490, branches/SuSE-Code-11-SP1-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] r60489 - in /branches/SuSE-Code-11-SP1-Branch/wagon/src/include: ./ Makefile.am common_func.ycp
by locilka＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: locilka Date: Fri Jan 22 13:38:59 2010 New Revision: 60489 URL: http://svn.opensuse.org/viewcvs/yast?rev=60489&view=rev Log: Missing files Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/include/ branches/SuSE-Code-11-SP1-Branch/wagon/src/include/Makefile.am branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/include/Makefile.am (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/include/Makefile.am Fri Jan 22 13:38:59 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-SP1-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp Fri Jan 22 13:38:59 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); + } +} -- 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] r60490 - /tags/branch-Code-11-SP1-2_17_0/openvas-security-scanner/
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:39:00 2010 New Revision: 60490 URL: http://svn.opensuse.org/viewcvs/yast?rev=60490&view=rev Log: Created tag branch-Code-11-SP1-2_17_0 for openvas-security-scanner Added: tags/branch-Code-11-SP1-2_17_0/openvas-security-scanner/ (props changed) - copied from r60488, branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/ -- 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] r60488 - in /branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner: VERSION package/yast2-openvas-security-scanner.changes
by jsrain＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: jsrain Date: Fri Jan 22 13:38:53 2010 New Revision: 60488 URL: http://svn.opensuse.org/viewcvs/yast?rev=60488&view=rev Log: bump Added: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/package/yast2-openvas-security-scanner.changes Modified: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/VERSION Modified: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/openv… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/VERSION Fri Jan 22 13:38:53 2010 @@ -1 +1 @@ -2.15.0 +2.17.0 Added: branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/package/yast2-openvas-security-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/openv… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/package/yast2-openvas-security-scanner.changes (added) +++ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/package/yast2-openvas-security-scanner.changes Fri Jan 22 13:38:53 2010 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Fri Jan 22 13:12:20 CET 2010 - jsrain(a)suse.cz + +- initial release (fate#307440) +- 2.17.0 + -- 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] r60487 - /branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml
by ug＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: ug Date: Fri Jan 22 12:56:10 2010 New Revision: 60487 URL: http://svn.opensuse.org/viewcvs/yast?rev=60487&view=rev Log: little docu fix Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/doc/CreateProfileDetails.xml Fri Jan 22 12:56:10 2010 @@ -350,7 +350,7 @@ <tbody> <row> <entry>device</entry> - <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/edd-int13_dev80</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>. + <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/ata-WDC_WD3200AAKS-75L9A0_WD-WMAV27368122</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>. <para><screen><device>/dev/hda</device></screen></para> </entry> <entry>optional. If left out, autoyast tries to guess the device. A RAID must always have "/dev/md" as device</entry> -- 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] r60486 - /trunk/autoinstallation/doc/CreateProfileDetails.xml
by ug＠svn.opensuse.org 22 Jan '10

22 Jan '10

Author: ug Date: Fri Jan 22 12:55:48 2010 New Revision: 60486 URL: http://svn.opensuse.org/viewcvs/yast?rev=60486&view=rev Log: little docu fix Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Fri Jan 22 12:55:48 2010 @@ -795,7 +795,7 @@ <tbody> <row> <entry>device</entry> - <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/edd-int13_dev80</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>. + <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/ata-WDC_WD3200AAKS-75L9A0_WD-WMAV27368122</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>. <para><screen><device>/dev/hda</device></screen></para> </entry> <entry>optional. If left out, autoyast tries to guess the device. A RAID must always have "/dev/md" as device</entry> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0