March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67609 - in /branches/SuSE-Code-11-SP2-Branch/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp yast2-wagon.spec.in
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 17:16:32 2012 New Revision: 67609 URL: http://svn.opensuse.org/viewcvs/yast?rev=67609&view=rev Log: - do not downgrade release packages, avoid migrating again (bnc#751147) - 2.17.32 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_selfupdate.ycp branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/VERSION Thu Mar 8 17:16:32 2012 @@ -1 +1 @@ -2.17.31 +2.17.32 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Mar 8 17:16:32 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 8 12:11:52 UTC 2012 - lslezak(a)suse.cz + +- do not downgrade release packages, avoid migrating again + (bnc#751147) +- 2.17.32 + +------------------------------------------------------------------- Wed Mar 7 08:14:29 UTC 2012 - lslezak(a)suse.cz - ensure that the migration products are removed (bnc#750746) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp Thu Mar 8 17:16:32 2012 @@ -57,16 +57,12 @@ 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; + if (Pkg::ResolvableUpdate(product_name, `product)) + { + affected_products = affected_products + 1; + } }); return affected_products; Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_selfupdate.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_selfupdate.ycp Thu Mar 8 17:16:32 2012 @@ -50,88 +50,19 @@ integer pkgs_affected = 0; - map <string, list <string> > installed_versions = $[]; - - boolean some_packages_selected = false; - foreach (string one_package, packages, { - // All packages of the given name - list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); - - // All installed packages of the given name - list <map <string, any> > installed = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `installed); - }); - - // All available packages of the given name - list <map <string, any> > available = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `available); - }); - - // Such package is not installed - if (size (installed) < 1) { - y2milestone ("Package %1 is not installed", one_package); - return; - } - - // Er, installed but not available - if (size (available) < 1) { - y2warning ("Package %1 is installed but not available", one_package); - return; - } - - // Remember the installed version(s) - installed_versions[one_package] = maplist (map <string,any> one_installed, installed, { - return one_installed["version"]:"unknown"; - }); + y2milestone ("Updating package %1", one_package); - // Force upgrade/install - y2milestone ("Selecting package %1 for installation", one_package); - if (Pkg::ResolvableInstall (one_package, `package) == true) { - some_packages_selected = true; - } else { - y2error ("Cannot install package %1", one_package); + if (Pkg::ResolvableUpdate(one_package, `package)) { + pkgs_affected = pkgs_affected + 1; } }); - if (some_packages_selected != true) { - y2milestone ("No packages have been selected for upgrade"); - return pkgs_affected; + if (pkgs_affected > 0) { + // run the solver to check dependencies + SolverRunWithFeedback(); } - // Calling solver to select the best version - SolverRunWithFeedback(); - - y2milestone ("Some packages have been selected, checking..."); - - // Check whether the selected version is different to the already installed one - foreach (string one_package, list <string> previously_installed_versions, installed_versions, { - list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); - - // All selected packages of the given name - list <map <string, any> > selected = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `selected); - }); - - // The package of a given name is selected - if (size (selected) > 0) { - boolean selection_differs = false; - - foreach (map <string, any> one_selected, selected, { - if (! contains (previously_installed_versions, one_selected["version"]:"some-version")) { - pkgs_affected = pkgs_affected + 1; - selection_differs = true; - break; - } - }); - - if (selection_differs != true) { - y2milestone ("Selection of packages doesn't differ, neutralizing package: %1", one_package); - Pkg::ResolvableNeutral (one_package, `package, false); - } - } - }); - return pkgs_affected; } Modified: branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in Thu Mar 8 17:16:32 2012 @@ -4,10 +4,10 @@ # String::FindMountPoint() Requires: yast2 >= 2.17.110 Requires: yast2-online-update-frontend >= 2.17.9 -# Pkg::AddUpgradeRepo() -Requires: yast2-pkg-bindings >= 2.17.48 -# Pkg::AddUpgradeRepo() -BuildRequires: yast2-pkg-bindings >= 2.17.48 +# Pkg::ResolvableUpdate() +Requires: yast2-pkg-bindings >= 2.17.58 +# Pkg::ResolvableUpdate() +BuildRequires: yast2-pkg-bindings >= 2.17.58 # String::FindMountPoint() BuildRequires: yast2 >= 2.17.110 -- 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] r67608 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 17:09:03 2012 New Revision: 67608 URL: http://svn.opensuse.org/viewcvs/yast?rev=67608&view=rev Log: - ensure that the migration products are removed (bnc#750746) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Mar 8 17:09:03 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 7 08:14:29 UTC 2012 - lslezak(a)suse.cz + +- ensure that the migration products are removed (bnc#750746) + +------------------------------------------------------------------- Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz - Automatically save solver test case in the migration proposal Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Thu Mar 8 17:09:03 2012 @@ -467,6 +467,14 @@ // be compatible with "zypper dup --from" Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); + // ensure the migration products are removed + foreach(string migration_product, migration_products, + { + y2milestone("Removing migration product: %1", migration_product); + Pkg::ResolvableRemove(migration_product, `product); + } + ); + if (MigrationType() == `full) { // run the solver to evaluate applicable patches -- 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] r67607 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp yast2-wagon.spec.in
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 17:00:29 2012 New Revision: 67607 URL: http://svn.opensuse.org/viewcvs/yast?rev=67607&view=rev Log: - do not downgrade release packages, avoid migrating again (bnc#751147) - 2.17.17.11 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 branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in 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 Thu Mar 8 17:00:29 2012 @@ -1 +1 @@ -2.17.17.10 +2.17.17.11 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 Thu Mar 8 17:00:29 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 8 12:11:52 UTC 2012 - lslezak(a)suse.cz + +- do not downgrade release packages, avoid migrating again + (bnc#751147) +- 2.17.17.11 + +------------------------------------------------------------------- Wed Mar 7 08:14:29 UTC 2012 - lslezak(a)suse.cz - ensure that the migration products are removed (bnc#750746) 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 Thu Mar 8 17:00:29 2012 @@ -57,16 +57,12 @@ 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; + if (Pkg::ResolvableUpdate(product_name, `product)) + { + affected_products = affected_products + 1; + } }); return affected_products; 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 Thu Mar 8 17:00:29 2012 @@ -50,88 +50,19 @@ integer pkgs_affected = 0; - map <string, list <string> > installed_versions = $[]; - - boolean some_packages_selected = false; - foreach (string one_package, packages, { - // All packages of the given name - list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); - - // All installed packages of the given name - list <map <string, any> > installed = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `installed); - }); - - // All available packages of the given name - list <map <string, any> > available = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `available); - }); - - // Such package is not installed - if (size (installed) < 1) { - y2milestone ("Package %1 is not installed", one_package); - return; - } - - // Er, installed but not available - if (size (available) < 1) { - y2warning ("Package %1 is installed but not available", one_package); - return; - } - - // Remember the installed version(s) - installed_versions[one_package] = maplist (map <string,any> one_installed, installed, { - return one_installed["version"]:"unknown"; - }); + y2milestone ("Updating package %1", one_package); - // Force upgrade/install - y2milestone ("Selecting package %1 for installation", one_package); - if (Pkg::ResolvableInstall (one_package, `package) == true) { - some_packages_selected = true; - } else { - y2error ("Cannot install package %1", one_package); + if (Pkg::ResolvableUpdate(one_package, `package)) { + pkgs_affected = pkgs_affected + 1; } }); - if (some_packages_selected != true) { - y2milestone ("No packages have been selected for upgrade"); - return pkgs_affected; + if (pkgs_affected > 0) { + // run the solver to check dependencies + SolverRunWithFeedback(); } - // Calling solver to select the best version - SolverRunWithFeedback(); - - y2milestone ("Some packages have been selected, checking..."); - - // Check whether the selected version is different to the already installed one - foreach (string one_package, list <string> previously_installed_versions, installed_versions, { - list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); - - // All selected packages of the given name - list <map <string, any> > selected = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `selected); - }); - - // The package of a given name is selected - if (size (selected) > 0) { - boolean selection_differs = false; - - foreach (map <string, any> one_selected, selected, { - if (! contains (previously_installed_versions, one_selected["version"]:"some-version")) { - pkgs_affected = pkgs_affected + 1; - selection_differs = true; - break; - } - }); - - if (selection_differs != true) { - y2milestone ("Selection of packages doesn't differ, neutralizing package: %1", one_package); - Pkg::ResolvableNeutral (one_package, `package, false); - } - } - }); - return pkgs_affected; } 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 Thu Mar 8 17:00:29 2012 @@ -4,10 +4,10 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 -# Pkg::AddUpgradeRepo() -Requires: yast2-pkg-bindings >= 2.17.45.1 -# Pkg::AddUpgradeRepo() -BuildRequires: yast2-pkg-bindings >= 2.17.45.1 +# Pkg::ResolvableUpdate() +Requires: yast2-pkg-bindings >= 2.17.45.6 +# Pkg::ResolvableUpdate() +BuildRequires: yast2-pkg-bindings >= 2.17.45.6 BuildRequires: perl-XML-Simple Requires: perl-XML-Simple -- 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] r67606 - /tags/branch-Code-11-SP2-2_17_58/pkg-bindings/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 16:53:35 2012 New Revision: 67606 URL: http://svn.opensuse.org/viewcvs/yast?rev=67606&view=rev Log: Created tag branch-Code-11-SP2-2_17_58 for pkg-bindings Added: tags/branch-Code-11-SP2-2_17_58/pkg-bindings/ (props changed) - copied from r67605, branches/SuSE-Code-11-SP2-Branch/pkg-bindings/ -- 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] r67605 - /tags/branch-Code-11-SP2-2_17_58/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 16:53:18 2012 New Revision: 67605 URL: http://svn.opensuse.org/viewcvs/yast?rev=67605&view=rev Log: Created tag branch-Code-11-SP2-2_17_58 Added: tags/branch-Code-11-SP2-2_17_58/ -- 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] r67604 - in /branches/SuSE-Code-11-SP2-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/PkgFunctions.h src/Resolvable_Install.cc
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 16:53:12 2012 New Revision: 67604 URL: http://svn.opensuse.org/viewcvs/yast?rev=67604&view=rev Log: - added Pkg::ResolvableUpdate() to avoid downgrading resolvables (bnc#751147) - 2.17.58 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Resolvable_Install.cc Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION Thu Mar 8 16:53:12 2012 @@ -1 +1 @@ -2.17.57 +2.17.58 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Thu Mar 8 16:53:12 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 8 08:16:23 UTC 2012 - lslezak(a)suse.cz + +- added Pkg::ResolvableUpdate() to avoid downgrading resolvables + (bnc#751147) +- 2.17.58 + +------------------------------------------------------------------- Thu Jan 26 11:50:25 UTC 2012 - lslezak(a)suse.cz - fixed saving additional repositories added by registration Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h Thu Mar 8 16:53:12 2012 @@ -234,6 +234,17 @@ // a helper function to add or remove an upgrade repository YCPValue AddRemoveUpgradeRepo(const YCPInteger &repo, bool add); + + // action for a resolvable + enum ResolvableAction + { + Install, + Remove, + Update + }; + + // helper for installing/removing/upgrading a resolvable + bool ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action); public: // general @@ -790,6 +801,8 @@ /* TYPEINFO: boolean(string,symbol,integer)*/ YCPValue ResolvableInstallRepo( const YCPString& name_r, const YCPSymbol& kind_r, const YCPInteger& repo_r ); /* TYPEINFO: boolean(string,symbol)*/ + YCPValue ResolvableUpdate( const YCPString& name_r, const YCPSymbol& kind_r ); + /* TYPEINFO: boolean(string,symbol)*/ YCPValue ResolvableRemove( const YCPString& name_r, const YCPSymbol& kind_r ); /* TYPEINFO: boolean(string,symbol,boolean)*/ YCPValue ResolvableNeutral( const YCPString& name_r, const YCPSymbol& kind_r, const YCPBoolean& force_r ); Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Resolvable_Install.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Resolvable_Install.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Resolvable_Install.cc Thu Mar 8 16:53:12 2012 @@ -236,7 +236,7 @@ return YCPBoolean(ret); } -bool ResolvableInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, bool install) +bool PkgFunctions::ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action) { zypp::Resolvable::Kind kind; @@ -275,9 +275,68 @@ if (s) { - y2milestone("%s: %s:%s ", install ? "Installing" : "Removing", req_kind.c_str(), name.c_str()); - return install ? s->setToInstall(zypp::ResStatus::APPL_HIGH): - s->setToDelete(zypp::ResStatus::APPL_HIGH); + if (action == Install) + { + y2milestone("Installing %s %s ", req_kind.c_str(), name.c_str()); + return s->setToInstall(zypp::ResStatus::APPL_HIGH); + } + else if (action == Remove) + { + y2milestone("Removing %s %s ", req_kind.c_str(), name.c_str()); + return s->setToDelete(zypp::ResStatus::APPL_HIGH); + } + else if (action == Update) + { + y2milestone("Updating %s %s ", req_kind.c_str(), name.c_str()); + + // update candidate + zypp::PoolItem update = s->updateCandidateObj(); + + // installed version + zypp::PoolItem installed; + if (zypp::traits::isPseudoInstalled(s->kind())) + { + for_(it, s->availableBegin(), s->availableEnd()) + // this is OK also for patches - isSatisfied() excludes !isRelevant() + if (it->status().isSatisfied() + && (!installed || installed->edition() < (*it)->edition())) + installed = *it; + } + else + { + installed = s->installedObj(); + } + + if (!installed) + { + y2milestone("%s is not installed, nothing to update", name.c_str()); + return false; + } + + if (!update) + { + y2milestone("Update for %s is not available, no change", name.c_str()); + return false; + } + + if (update->edition() > installed->edition()) + { + y2milestone("Updating %s from %s.%s to %s.%s", name.c_str(), installed->edition().asString().c_str(), + installed->arch().asString().c_str(), update->edition().asString().c_str(), update->arch().asString().c_str()); + return update.status().setToBeInstalled(whoWantsIt); + } + else + { + y2milestone("%s %s: installed version (%s) is higher than available update (%s), no change", + req_kind.c_str(), name.c_str(), installed->edition().asString().c_str(), update->edition().asString().c_str()); + return false; + } + } + else + { + y2internal("Unknown resolvable action"); + return false; + } } else { @@ -298,12 +357,27 @@ YCPValue PkgFunctions::ResolvableInstall( const YCPString& name_r, const YCPSymbol& kind_r ) { - // true = install - return YCPBoolean(ResolvableInstallOrDelete(name_r, kind_r, true)); + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Install)); } // ------------------------ /** + @builtin ResolvableUpgrade + @short Install all resolvables with selected name and kind + @param name_r name of the resolvable + @param kind_r kind of resolvable, can be `product, `patch, `package, `srcpackage or `pattern + @return boolean true if upgrade candidate was selected, false if the highest version is already installed or if there is no upgrade candidate + * +*/ +YCPValue +PkgFunctions::ResolvableUpdate( const YCPString& name_r, const YCPSymbol& kind_r ) +{ + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Update)); +} + + +// ------------------------ +/** @builtin ResolvableRemove @short Removes all resolvables with selected name and kind @param name_r name of the resolvable @@ -314,7 +388,7 @@ PkgFunctions::ResolvableRemove ( const YCPString& name_r, const YCPSymbol& kind_r ) { // false = remove - return YCPBoolean(ResolvableInstallOrDelete(name_r, kind_r, false)); + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Remove)); } // ------------------------ -- 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] r67603 - in /trunk/s390/src: modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: aschnell Date: Thu Mar 8 16:08:25 2012 New Revision: 67603 URL: http://svn.opensuse.org/viewcvs/yast?rev=67603&view=rev Log: - cleanup Modified: trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Thu Mar 8 16:08:25 2012 @@ -103,27 +103,27 @@ return tohexstring(tointeger(wwpn), 16); } - global boolean IsValidFCPLUN(string fcp_lun) + global boolean IsValidLUN(string lun) { string regexp = "^0x([[:xdigit:]]{1,16})$"; - return regexpmatch(fcp_lun, regexp); + return regexpmatch(lun, regexp); } - global string FormatFCPLUN(string fcp_lun) + global string FormatLUN(string lun) { - if (!IsValidFCPLUN(fcp_lun)) - return fcp_lun; + if (!IsValidLUN(lun)) + return lun; - return tohexstring(tointeger(fcp_lun), 16); + return tohexstring(tointeger(lun), 16); } - global string GetNextLUN(string fcp_lun) + global string GetNextLUN(string lun) { - if (fcp_lun == nil || fcp_lun == "") - fcp_lun = "0"; + if (lun == nil || lun == "") + lun = "0"; - integer old_lun = tointeger(fcp_lun); + integer old_lun = tointeger(lun); integer new_lun = old_lun; foreach (integer k, map<string, any> v, devices, { @@ -206,7 +206,7 @@ "detail" : $[ "controller_id" : FormatChannel(d["controller_id"]:""), "wwpn" : FormatWWPN(d["wwpn"]:""), - "fcp_lun" : FormatFCPLUN(d["fcp_lun"]:""), + "fcp_lun" : FormatLUN(d["fcp_lun"]:""), ], ]; return $[ index : m ]; Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Thu Mar 8 16:08:25 2012 @@ -74,8 +74,8 @@ items = maplist(integer k, map<string, any> d, devices, { string channel = d["detail", "controller_id"]:""; string wwpn = d["detail", "wwpn"]:""; - string fcp_lun = d["detail", "fcp_lun"]:""; - return `item(`id(k), channel, wwpn, fcp_lun); + string lun = d["detail", "fcp_lun"]:""; + return `item(`id(k), channel, wwpn, lun); }); } else @@ -83,9 +83,9 @@ items = maplist(integer k, map<string, any> d, devices, { string channel = d["detail", "controller_id"]:""; string wwpn = d["detail", "wwpn"]:""; - string fcp_lun = d["detail", "fcp_lun"]:""; + string lun = d["detail", "fcp_lun"]:""; string dev_name = d["dev_name"]:""; - return `item(`id(k), channel, wwpn, fcp_lun, dev_name); + return `item(`id(k), channel, wwpn, lun, dev_name); }); } @@ -259,7 +259,7 @@ wwpns = toset(wwpns); luns = maplist(integer index, map<string, any> d, ZFCPController::devices, { - return d["detail", "zfp_lun"]:""; + return d["detail", "fcp_lun"]:""; }); luns = toset(luns); } @@ -271,11 +271,11 @@ wwpns = [ ZFCPController::previous_settings["wwpn"]:"" ]; - string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; - if (!isempty(fcp_lun)) - fcp_lun = ZFCPController::GetNextLUN(fcp_lun); + string lun = ZFCPController::previous_settings["fcp_lun"]:""; + if (!isempty(lun)) + lun = ZFCPController::GetNextLUN(lun); - luns = [ fcp_lun ]; + luns = [ lun ]; } term content = `HBox (`HStretch (), `VBox( @@ -292,7 +292,7 @@ `VSpacing (2), `HBox( // combobox - `ComboBox(`id(`fcp_lun), `opt(`hstretch, `editable), _("&LUN"), luns), + `ComboBox(`id(`lun), `opt(`hstretch, `editable), _("&LUN"), luns), // push button Mode::config() ? `Empty() : `PushButton(`id(`get_lun), _("Get LUNs")) ), @@ -306,7 +306,7 @@ UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); UI::ChangeWidget(`id(`wwpn), `ValidChars, "0123456789abcdefABCDEFx"); - UI::ChangeWidget(`id(`fcp_lun), `ValidChars, "0123456789abcdefABCDEFx"); + UI::ChangeWidget(`id(`lun), `ValidChars, "0123456789abcdefABCDEFx"); UI::SetFocus(`id(`channel)); @@ -361,7 +361,7 @@ wwpn = ZFCPController::FormatWWPN(wwpn); luns = ZFCPController::GetLUNs(channel, wwpn); - UI::ChangeWidget(`fcp_lun, `Items, luns); + UI::ChangeWidget(`lun, `Items, luns); ret = nil; } else if (ret == `abort || ret == `cancel) @@ -377,7 +377,7 @@ { string channel = (string) UI::QueryWidget(`id(`channel), `Value); string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); - string fcp_lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); + string lun = (string) UI::QueryWidget(`id(`lun), `Value); if (!ZFCPController::IsValidChannel(channel)) { @@ -397,20 +397,20 @@ continue; } - if (!ZFCPController::IsValidFCPLUN(fcp_lun)) + if (!ZFCPController::IsValidLUN(lun)) { // error popup Report::Error(_("The entered LUN is invalid.")); - UI::SetFocus(`fcp_lun); + UI::SetFocus(`lun); ret = nil; continue; } channel = ZFCPController::FormatChannel(channel); wwpn = ZFCPController::FormatWWPN(wwpn); - fcp_lun = ZFCPController::FormatFCPLUN(fcp_lun); + lun = ZFCPController::FormatLUN(lun); - if (ZFCPController::GetDeviceIndex(channel, wwpn, fcp_lun) != nil) + if (ZFCPController::GetDeviceIndex(channel, wwpn, lun) != nil) { // error popup Popup::Error(_("Device already exists.")); @@ -424,11 +424,11 @@ { string channel = (string) UI::QueryWidget(`id(`channel), `Value); string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); - string lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); + string lun = (string) UI::QueryWidget(`id(`lun), `Value); channel = ZFCPController::FormatChannel(channel); wwpn = ZFCPController::FormatWWPN(wwpn); - lun = ZFCPController::FormatFCPLUN(lun); + lun = ZFCPController::FormatLUN(lun); ZFCPController::previous_settings["channel"] = channel; ZFCPController::previous_settings["wwpn"] = wwpn; @@ -482,8 +482,8 @@ map d = ZFCPController::devices[index]:$[]; string channel = d["detail", "controller_id"]:""; string wwpn = d["detail", "wwpn"]:""; - string fcp_lun = d["detail", "fcp_lun"]:""; - ZFCPController::DeactivateDisk(channel, wwpn, fcp_lun); + string lun = d["detail", "fcp_lun"]:""; + ZFCPController::DeactivateDisk(channel, wwpn, lun); }); ZFCPController::ProbeDisks(); -- 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] r67602 - /tags/branch-Code-11-SP1-2_17_45_6/pkg-bindings/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 13:40:05 2012 New Revision: 67602 URL: http://svn.opensuse.org/viewcvs/yast?rev=67602&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_6 for pkg-bindings Added: tags/branch-Code-11-SP1-2_17_45_6/pkg-bindings/ (props changed) - copied from r67601, branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ -- 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] r67601 - /tags/branch-Code-11-SP1-2_17_45_6/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 13:39:52 2012 New Revision: 67601 URL: http://svn.opensuse.org/viewcvs/yast?rev=67601&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_6 Added: tags/branch-Code-11-SP1-2_17_45_6/ -- 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] r67600 - /tags/branch-Code-11-SP1-2_17_17_11/wagon/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 13:39:39 2012 New Revision: 67600 URL: http://svn.opensuse.org/viewcvs/yast?rev=67600&view=rev Log: Created tag branch-Code-11-SP1-2_17_17_11 for wagon Added: tags/branch-Code-11-SP1-2_17_17_11/wagon/ (props changed) - copied from r67599, 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