Merge pull request #64 from yast/sle-12-sp2-update-proposal

Install additional packages during upgrade

.travis.yml

@@ -5,7 +5,7 @@ before_install:
     # disable rvm, use system Ruby
     - rvm reset
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-packager yast2-installation-control" -g "rspec:3.3.0 yast-rake gettext"
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-packager yast2-installation-control yast2-country" -g "rspec:3.3.0 yast-rake gettext"
 script:
     - rake check:syntax
     - rake check:pot

package/yast2-update.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 30 12:07:55 UTC 2017 - igonzalezsosa@suse.com
+
+- Allow YaST modules to add packages during upgrade (bsc#1009834)
+- 3.1.44
+
 -------------------------------------------------------------------
 Thu Sep 29 08:02:43 UTC 2016 - igonzalezsosa@suse.com
 

package/yast2-update.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        3.1.43
+Version:        3.1.44
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -29,7 +29,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:  yast2-devtools >= 3.1.15
 BuildRequires:  yast2-ruby-bindings >= 1.0.0
 BuildRequires:  yast2 >= 3.1.126
-BuildRequires:  yast2-packager
+# Packages#proposal_for_update
+BuildRequires:  yast2-packager >= 3.1.120
 
 # xmllint
 BuildRequires:	libxml2-tools
@@ -46,8 +47,8 @@ Requires:	yast2-storage >= 2.22.9
 Requires:	yast2 >= 3.1.126
 Requires:	yast2-installation
 
-# packager/product_patterns.rb
-Requires:	yast2-packager >= 3.1.95
+# Packages#proposal_for_update
+Requires:	yast2-packager >= 3.1.120
 
 # Pkg.TargetInitializeOptions()
 Requires:       yast2-pkg-bindings >= 3.1.14

src/clients/packages_proposal.rb

@@ -40,6 +40,7 @@ def main
       Yast.import "Packages"
       Yast.import "SpaceCalculation"
       Yast.import "PackagesUI"
+      Yast.import "Packages"
 
       Yast.import "Update"
 
@@ -62,6 +63,9 @@ def main
         #	SpaceCalculation::ShowPartitionWarning ();
         @warning = SpaceCalculation.GetPartitionWarning
 
+        # Make an update proposal
+        Packages.proposal_for_update
+
         # Count statistics -->
         # Pkg::GetPackages()
         #   `installed all installed packages
@@ -145,26 +149,36 @@ def main
           )
         )
 
+        @ret = {
+          "trigger" => {
+            "expect" => {
+              "class" => "Yast::Packages",
+              "method" => "PackagesProposalChanged"
+            },
+            "value" => false
+          }
+        }
+
         if Ops.greater_than(Update.solve_errors, 0)
           # the proposal for the packages requires manual invervention
-          @ret = {
+          @ret.merge!({
             "preformatted_proposal" => HTML.List(@tmp),
             "links"                 => [PACKAGER_LINK],
             # TRANSLATORS: warning text, keep the HTML tags (<a href...>) untouched
             "warning"               => _(
               "Cannot solve all conflicts. <a href=\"%s\">Manual intervention is required.</a>"
             ) % PACKAGER_LINK,
             "warning_level"         => :blocker
-          }
+          })
         elsif Ops.greater_than(Builtins.size(@warning), 0)
           # the proposal for the packages requires manual intervention
-          @ret = {
+          @ret.merge!({
             "preformatted_proposal" => HTML.List(@tmp),
             "warning"               => Builtins.mergestring(@warning, "<br>"),
             "warning_level"         => :warning
-          }
+          })
         else
-          @ret = { "preformatted_proposal" => HTML.List(@tmp) }
+          @ret.merge!({ "preformatted_proposal" => HTML.List(@tmp) })
         end
 
         Builtins.y2milestone(

test/Makefile.am

@@ -2,6 +2,7 @@ TESTS = \
   root_part_test.rb \
   suse_release_test.rb \
   inst_update_partition_auto_test.rb \
+  packages_proposal_test.rb \
   update_test.rb
 
 TEST_EXTENSIONS = .rb

test/packages_proposal_test.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+require_relative "../src/clients/packages_proposal"
+
+describe Yast::PackagesProposalClient do
+  subject(:client) { described_class.new }
+
+  before do
+    allow(Yast::WFM).to receive(:Args) do |n|
+      n.nil? ? args : args[n]
+    end
+  end
+
+  describe "#main" do
+    context "when action is MakeProposal" do
+      let(:args) { ["MakeProposal"] }
+
+      PACKAGES = {
+        installed: ["grub", "elilo"],
+        selected:  ["grub", "grub2-efi", "grub2-pc"],
+        removed:   ["elilo"]
+      }
+
+      before do
+        allow(Yast::SpaceCalculation).to receive(:GetPartitionWarning)
+          .and_return(nil)
+        allow(Yast::Packages).to receive(:proposal_for_update)
+        allow(Yast::Pkg).to receive(:GetPackages).with(anything, true) do |status, _names_only|
+          PACKAGES[status]
+        end
+      end
+
+      it "asks for a packages selection proposal" do
+        expect(Yast::Packages).to receive(:proposal_for_update)
+        client.main
+      end
+
+      it "summarizes packages to update/install/remove" do
+        expect(Yast::Update).to receive(:packages_to_update=)
+          .with(1)
+        expect(Yast::Update).to receive(:packages_to_install=)
+          .with(2)
+        expect(Yast::Update).to receive(:packages_to_remove=)
+          .with(1)
+        client.main
+      end
+
+      it "is meant to be triggered if packages proposal changes" do
+        expect(client.main["trigger"]).to eq({
+          "expect" => { "class" => "Yast::Packages", "method" => "PackagesProposalChanged" },
+          "value" => false
+        })
+      end
+    end
+  end
+end