Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2016-10-18 13:28:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2016-10-13 11:25:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2016-10-18 13:28:02.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Oct 17 07:41:00 UTC 2016 - [email protected] + +- Update the priority for the loaded packages when starting the + repository manager from the package manager (bsc#498266) +- 3.2.4 + +------------------------------------------------------------------- +Fri Oct 14 11:03:49 UTC 2016 - [email protected] + +- allow SLES for SAP upgrade from 11 to 12 as it is renamed + (bsc#1004665) +- 3.2.3 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.2.2.tar.bz2 New: ---- yast2-packager-3.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.N1HIpW/_old 2016-10-18 13:28:03.000000000 +0200 +++ /var/tmp/diff_new_pack.N1HIpW/_new 2016-10-18 13:28:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.2.2 +Version: 3.2.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,14 +38,14 @@ # needed for icon for desktop file, it is verified at the end of build BuildRequires: yast2_theme -# Pkg::UrlSchemeIs*() -BuildRequires: yast2-pkg-bindings >= 3.2.0 +# Pkg::SourceSetPriority() +BuildRequires: yast2-pkg-bindings >= 3.2.1 # Newly added RPM Requires: yast2-country-data >= 2.16.3 -# Pkg::UrlSchemeIs*() -Requires: yast2-pkg-bindings >= 3.2.0 +# Pkg::SourceSetPriority() +Requires: yast2-pkg-bindings >= 3.2.1 # Packages::Repository and Packages::Product classes Requires: yast2 >= 3.1.187 ++++++ yast2-packager-3.2.2.tar.bz2 -> yast2-packager-3.2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.2.2/package/yast2-packager.changes new/yast2-packager-3.2.4/package/yast2-packager.changes --- old/yast2-packager-3.2.2/package/yast2-packager.changes 2016-10-11 11:29:31.000000000 +0200 +++ new/yast2-packager-3.2.4/package/yast2-packager.changes 2016-10-17 13:13:41.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Oct 17 07:41:00 UTC 2016 - [email protected] + +- Update the priority for the loaded packages when starting the + repository manager from the package manager (bsc#498266) +- 3.2.4 + +------------------------------------------------------------------- +Fri Oct 14 11:03:49 UTC 2016 - [email protected] + +- allow SLES for SAP upgrade from 11 to 12 as it is renamed + (bsc#1004665) +- 3.2.3 + +------------------------------------------------------------------- Mon Oct 10 14:07:57 UTC 2016 - [email protected] - Do not ask for a CD when the add-on check box is unchecked diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.2.2/package/yast2-packager.spec new/yast2-packager-3.2.4/package/yast2-packager.spec --- old/yast2-packager-3.2.2/package/yast2-packager.spec 2016-10-11 11:29:31.000000000 +0200 +++ new/yast2-packager-3.2.4/package/yast2-packager.spec 2016-10-17 13:13:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.2.2 +Version: 3.2.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,14 +38,14 @@ # needed for icon for desktop file, it is verified at the end of build BuildRequires: yast2_theme -# Pkg::UrlSchemeIs*() -BuildRequires: yast2-pkg-bindings >= 3.2.0 +# Pkg::SourceSetPriority() +BuildRequires: yast2-pkg-bindings >= 3.2.1 # Newly added RPM Requires: yast2-country-data >= 2.16.3 -# Pkg::UrlSchemeIs*() -Requires: yast2-pkg-bindings >= 3.2.0 +# Pkg::SourceSetPriority() +Requires: yast2-pkg-bindings >= 3.2.1 # Packages::Repository and Packages::Product classes Requires: yast2 >= 3.1.187 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.2.2/src/clients/repositories.rb new/yast2-packager-3.2.4/src/clients/repositories.rb --- old/yast2-packager-3.2.2/src/clients/repositories.rb 2016-10-11 11:29:31.000000000 +0200 +++ new/yast2-packager-3.2.4/src/clients/repositories.rb 2016-10-17 13:13:41.000000000 +0200 @@ -591,6 +591,17 @@ end end + # if started from the package manager we need to call these extra + # pkg-bindings to sync the pool state + if @full_mode + @sourceStatesOut.each do |src| + srcid = src["SrcId"] + next unless Pkg.SourceGetCurrent(false).include?(srcid) + + Pkg.SourceSetEnabled(srcid, src["enabled"]) + Pkg.SourceSetPriority(srcid, src["priority"]) + end + end Builtins.y2milestone("New repo config: %1", @sourceStatesOut) success = success && Pkg.SourceEditSet(@sourceStatesOut) @@ -1598,13 +1609,6 @@ UI.ChangeWidget(Id(:table), term(:Item, current, 1), newstate) Ops.set(sourceState, "enabled", state) Ops.set(@sourceStatesOut, global_current, sourceState) - - if @full_mode - Pkg.SourceSetEnabled( - Ops.get_integer(sourceState, "SrcId", -1), - state - ) - end else srv = Ops.get(@serviceStatesOut, current, {}) Builtins.y2milestone("Selected service: %1", srv) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.2.2/src/modules/AddOnProduct.rb new/yast2-packager-3.2.4/src/modules/AddOnProduct.rb --- old/yast2-packager-3.2.2/src/modules/AddOnProduct.rb 2016-10-11 11:29:31.000000000 +0200 +++ new/yast2-packager-3.2.4/src/modules/AddOnProduct.rb 2016-10-17 13:13:41.000000000 +0200 @@ -137,13 +137,14 @@ # this is the static default for offline updates # mapping: <old_name> => [ <new_name> ] @product_renames = { - "SUSE_SLES" => [ "SLES" ], + "SUSE_SLES" => [ "SLES" ], # SLED or Workstation extension - "SUSE_SLED" => [ "SLED", "sle-we" ], - "sle-haegeo" => [ "sle-ha-geo" ], - "sle-hae" => [ "sle-ha" ], + "SUSE_SLED" => [ "SLED", "sle-we" ], + "sle-haegeo" => [ "sle-ha-geo" ], + "sle-hae" => [ "sle-ha" ], + "SUSE_SLES_SAP" => [ "SLES_SAP" ], # SMT is now integrated into the base SLES - "sle-smt" => [ "SLES" ] + "sle-smt" => [ "SLES" ] } end
