Merge branch 'SLE-12-SP2' into sle-12-sp2-casp-update-proposal

* SLE-12-SP2:
  Install additional packages during upgrade (#222)

package/yast2-packager.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 30 10:57:14 UTC 2017 - igonzalezsosa@suse.com
+
+- Packages module is able to perform a package selection proposal
+  during system upgrade (bsc#1009834)
+- 3.1.119.4
+
 -------------------------------------------------------------------
 Tue Jan 24 13:15:46 UTC 2017 - jsrain@suse.cz
 

package/yast2-packager.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.1.119.3
+Version:        3.1.119.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/modules/Packages.rb

@@ -2394,6 +2394,17 @@ def Proposal(force_reset, reinit, simple)
       deep_copy(ret)
     end
 
+    # Make a proposal for package selection during update
+    #
+    # As a side effect, it stores the current proposal.
+    #
+    # @see PackagesProposalChanged
+    def proposal_for_update
+      return unless PackagesProposalChanged()
+      @old_packages_proposal = PackagesProposal.GetAllResolvablesForAllTypes
+      Packages.SelectSystemPackages(false)
+    end
+
     # Initialize the repositories with popup feedback
     # Use Packages::Initialize (true) instead
     def InitializeCatalogs

test/packages_test.rb

@@ -993,4 +993,27 @@ def product(properties = {})
     end
   end
 
+  describe "#proposal_for_update" do
+    before do
+      allow(subject).to receive(:PackagesProposalChanged).and_return(changed)
+    end
+
+    context "when packages proposal was changed" do
+      let(:changed) { true }
+
+      it "selects system packages" do
+        expect(subject).to receive(:SelectSystemPackages).with(false)
+        subject.proposal_for_update
+      end
+    end
+
+    context "when packages proposal was not changed" do
+      let(:changed) { false }
+
+      it "does not select system packages" do
+        expect(subject).to_not receive(:SelectSystemPackages)
+        subject.proposal_for_update
+      end
+    end
+  end
 end