Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-08-07 08:08:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2014-07-30 07:34:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-08-07 08:08:19.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 6 12:11:15 CEST 2014 - [email protected] + +- Exporting user deleted packages correctly. Only locked packages + will be suggested for because no additional information is + currently available. (bnc#888296) +- 3.1.53 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.52.tar.bz2 New: ---- autoyast2-3.1.53.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.ZkALuJ/_old 2014-08-07 08:08:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ZkALuJ/_new 2014-08-07 08:08:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.52 +Version: 3.1.53 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.52.tar.bz2 -> autoyast2-3.1.53.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.52/package/autoyast2.changes new/autoyast2-3.1.53/package/autoyast2.changes --- old/autoyast2-3.1.52/package/autoyast2.changes 2014-07-29 08:40:45.000000000 +0200 +++ new/autoyast2-3.1.53/package/autoyast2.changes 2014-08-06 16:59:43.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Aug 6 12:11:15 CEST 2014 - [email protected] + +- Exporting user deleted packages correctly. Only locked packages + will be suggested for because no additional information is + currently available. (bnc#888296) +- 3.1.53 + +------------------------------------------------------------------- Mon Jul 28 15:38:59 CEST 2014 - [email protected] - Set the correct runlevel while autyast installation (bnc#889055) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.52/package/autoyast2.spec new/autoyast2-3.1.53/package/autoyast2.spec --- old/autoyast2-3.1.52/package/autoyast2.spec 2014-07-29 08:40:45.000000000 +0200 +++ new/autoyast2-3.1.53/package/autoyast2.spec 2014-08-06 16:59:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.52 +Version: 3.1.53 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.52/src/modules/AutoinstSoftware.rb new/autoyast2-3.1.53/src/modules/AutoinstSoftware.rb --- old/autoyast2-3.1.52/src/modules/AutoinstSoftware.rb 2014-07-29 08:40:45.000000000 +0200 +++ new/autoyast2-3.1.53/src/modules/AutoinstSoftware.rb 2014-08-06 16:59:43.000000000 +0200 @@ -939,6 +939,14 @@ nil end + def locked_packages + packages = Pkg.ResolvableProperties("", :package, "").select do |package| + # hard AND soft locks + package["transact_by"] == :user && (package["locked"] || package["status"] == :available) + end + packages.map! {|p| p["name"] } + end + # Return list of software packages of calling client # in the installed environment # @return [Hash] map of installed software package @@ -981,7 +989,6 @@ userpackages = Pkg.FilterPackages(false, false, true, true) Pkg.TargetFinish # Remove kernel packages - removepackages = [] patternPackages = [] new_p = [] @@ -1050,11 +1057,6 @@ userpackages = Builtins.add(userpackages, p) end end - Builtins.foreach(patternPackages) do |p| - if !Builtins.contains(@inst, p) - removepackages = Builtins.add(removepackages, p) - end - end end Ops.set( @@ -1065,7 +1067,11 @@ end) ) Ops.set(software, "patterns", Builtins.sort(patterns)) - Ops.set(software, "remove-packages", Builtins.toset(removepackages)) + # Currently we do not have any information about user deleted packages in + # the installed system. + # In order to prevent a reinstallation we can take the locked packages at least. + # (bnc#888296) + software["remove-packages"] = locked_packages deep_copy(software) end @@ -1093,18 +1099,10 @@ user_selected = true, name_only = true) - remove_packages = Pkg.ResolvableProperties("", :package, "").collect do |package| - if package["transact_by"] == :user && - (package["locked"] == true || - package["status"] == :available) #weak lock - package["name"] - end - end - software = {} software["packages"] = install_packages software["patterns"] = install_patterns.compact - software["remove-packages"] = remove_packages.compact + software["remove-packages"] = locked_packages Builtins.y2milestone("autoyast software selection: %1", software) deep_copy(software) end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
