Hello community,

here is the log from the commit of package yast2-packager for openSUSE:Factory 
checked in at 2018-03-07 10:29:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-packager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-packager"

Wed Mar  7 10:29:37 2018 rev:346 rq:583285 version:4.0.46

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes    
2018-03-04 11:50:55.685764520 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes       
2018-03-07 10:29:44.313167987 +0100
@@ -1,0 +2,8 @@
+Mon Mar  5 16:08:55 CET 2018 - sch...@suse.de
+
+- Confirm base license: parameter for disabling back button.
+  Needed for showing base product license while AutoYaST
+  installation (bnc#1073324).
+- 4.0.46
+
+-------------------------------------------------------------------

Old:
----
  yast2-packager-4.0.45.tar.bz2

New:
----
  yast2-packager-4.0.46.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.933mD4/_old  2018-03-07 10:29:44.937145479 +0100
+++ /var/tmp/diff_new_pack.933mD4/_new  2018-03-07 10:29:44.941145335 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.0.45
+Version:        4.0.46
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-packager-4.0.45.tar.bz2 -> yast2-packager-4.0.46.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.0.45/package/yast2-packager.changes 
new/yast2-packager-4.0.46/package/yast2-packager.changes
--- old/yast2-packager-4.0.45/package/yast2-packager.changes    2018-03-02 
14:45:57.000000000 +0100
+++ new/yast2-packager-4.0.46/package/yast2-packager.changes    2018-03-06 
11:57:17.000000000 +0100
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Mon Mar  5 16:08:55 CET 2018 - sch...@suse.de
+
+- Confirm base license: parameter for disabling back button.
+  Needed for showing base product license while AutoYaST
+  installation (bnc#1073324).
+- 4.0.46
+
+-------------------------------------------------------------------
 Fri Mar  2 13:38:40 UTC 2018 - lsle...@suse.cz
 
 - Updated repository selection label to be more understandable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.0.45/package/yast2-packager.spec 
new/yast2-packager-4.0.46/package/yast2-packager.spec
--- old/yast2-packager-4.0.45/package/yast2-packager.spec       2018-03-02 
14:45:57.000000000 +0100
+++ new/yast2-packager-4.0.46/package/yast2-packager.spec       2018-03-06 
11:57:17.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.0.45
+Version:        4.0.46
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-packager-4.0.45/src/lib/y2packager/clients/inst_product_license.rb 
new/yast2-packager-4.0.46/src/lib/y2packager/clients/inst_product_license.rb
--- 
old/yast2-packager-4.0.45/src/lib/y2packager/clients/inst_product_license.rb    
    2018-03-02 14:45:57.000000000 +0100
+++ 
new/yast2-packager-4.0.46/src/lib/y2packager/clients/inst_product_license.rb    
    2018-03-06 11:57:17.000000000 +0100
@@ -14,6 +14,7 @@
 require "y2packager/dialogs/inst_product_license"
 require "y2packager/product"
 Yast.import "Language"
+Yast.import "GetInstArgs"
 
 module Y2Packager
   module Clients
@@ -32,7 +33,11 @@
       def main
         textdomain "installation"
         return :auto unless multi_product_media? && available_license?
-        Y2Packager::Dialogs::InstProductLicense.new(product).run
+
+        Yast::Wizard.EnableAbortButton
+        disable_buttons = !Yast::GetInstArgs.enable_back ? [:back] : []
+        Y2Packager::Dialogs::InstProductLicense.new(product,
+          disable_buttons: disable_buttons).run
       end
 
     private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-packager-4.0.45/src/lib/y2packager/dialogs/inst_product_license.rb 
new/yast2-packager-4.0.46/src/lib/y2packager/dialogs/inst_product_license.rb
--- 
old/yast2-packager-4.0.45/src/lib/y2packager/dialogs/inst_product_license.rb    
    2018-03-02 14:45:57.000000000 +0100
+++ 
new/yast2-packager-4.0.46/src/lib/y2packager/dialogs/inst_product_license.rb    
    2018-03-06 11:57:17.000000000 +0100
@@ -25,14 +25,19 @@
       # @return [Y2Packager::Product] Product
       attr_reader :product
 
+      # @return [Array<String>] list of buttons to disable ("next_button",...)
+      attr_reader :disable_buttons
+
       # Constructor
       #
       # @param product [Y2Packager::Product] Product to ask for the license
-      def initialize(product)
+      # @param disable_buttons [Array<String>] list of buttons to disable
+      def initialize(product, disable_buttons: [])
         super()
         textdomain "packager"
 
         @product = product
+        @disable_buttons = disable_buttons.map { |b| "#{b}_button" }
       end
 
       # Returns the dialog title
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-packager-4.0.45/test/lib/clients/inst_product_license_test.rb 
new/yast2-packager-4.0.46/test/lib/clients/inst_product_license_test.rb
--- old/yast2-packager-4.0.45/test/lib/clients/inst_product_license_test.rb     
2018-03-02 14:45:57.000000000 +0100
+++ new/yast2-packager-4.0.46/test/lib/clients/inst_product_license_test.rb     
2018-03-06 11:57:17.000000000 +0100
@@ -33,9 +33,17 @@
   end
 
   describe "#main" do
-    it "opens the license dialog with the selected product" do
+    it "opens the license dialog with the selected product (without back 
button)" do
+      expect(Yast::GetInstArgs).to receive(:enable_back).and_return(false)
       expect(Y2Packager::Dialogs::InstProductLicense).to receive(:new)
-        .with(product)
+        .with(product, disable_buttons: [:back])
+      client.main
+    end
+
+    it "opens the license dialog with the selected product (with back button)" 
do
+      expect(Yast::GetInstArgs).to receive(:enable_back).and_return(true)
+      expect(Y2Packager::Dialogs::InstProductLicense).to receive(:new)
+        .with(product, disable_buttons: [])
       client.main
     end
 


Reply via email to