From b0d5d67254d34c82c8894c7aea337297dad2481d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.cz>
Date: Fri, 27 Oct 2017 17:12:15 +0200
Subject: [PATCH 1/3] Do not install all available products (bsc#1065485)

(like SLED on SLES) during upgrade

- 4.0.15
---
 package/yast2-packager.changes | 7 +++++++
 package/yast2-packager.spec    | 2 +-
 src/modules/Packages.rb        | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
index bde61b31a..191ba2ab6 100644
--- a/package/yast2-packager.changes
+++ b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct 27 15:28:29 UTC 2017 - lslezak@suse.cz
+
+- Do not install all available products (like SLED on SLES) during
+  upgrade (bsc#1065485)
+- 4.0.16
+
 -------------------------------------------------------------------
 Thu Oct 26 16:11:50 CEST 2017 - schubi@suse.de
 
diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
index 364111395..352b85d5d 100644
--- a/package/yast2-packager.spec
+++ b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.0.15
+Version:        4.0.16
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/src/modules/Packages.rb b/src/modules/Packages.rb
index 428d86bc3..46a109666 100644
--- a/src/modules/Packages.rb
+++ b/src/modules/Packages.rb
@@ -1902,6 +1902,11 @@ def SelectProduct
         return true
       end
 
+      if Mode.update
+        log.info("Update mode - skipping product selection")
+        return true
+      end
+
       products = Pkg.ResolvableProperties("", :product, "")
 
       if !products || products.empty?

From 392f1d6778aee624f7310e8dadfc92cb2e672b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.cz>
Date: Fri, 27 Oct 2017 09:30:18 +0200
Subject: [PATCH 2/3] Added devel/test_addon_selector.rb testing client

---
 devel/README.md              |  4 ++++
 devel/test_addon_selector.rb | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 devel/README.md
 create mode 100755 devel/test_addon_selector.rb

diff --git a/devel/README.md b/devel/README.md
new file mode 100644
index 000000000..7c9501600
--- /dev/null
+++ b/devel/README.md
@@ -0,0 +1,4 @@
+# Development Code
+
+This directory contains code examples which is can be useful for development.
+They are not intented for regular use by end users.
diff --git a/devel/test_addon_selector.rb b/devel/test_addon_selector.rb
new file mode 100755
index 000000000..b93b033e9
--- /dev/null
+++ b/devel/test_addon_selector.rb
@@ -0,0 +1,29 @@
+# This is a testing client for the addon product dialog which is displayed
+# after adding a multi-repository medium.
+#
+# Run it using "yast2 ./test_addon_selector.rb" command
+
+require "y2packager/product_location"
+require "y2packager/dialogs/addon_selector"
+
+new_repos = [
+  ["Basesystem-Module 15-0", "/Basesystem"],
+  ["Desktop-Applications-Module 15-0", "/Desktop-Applications"],
+  ["Desktop-Productivity-Module 15-0", "/Desktop-Productivity"],
+  ["Development-Tools-Module 15-0", "/Development-Tools"],
+  ["HA-Module 15-0", "/HA"],
+  ["HPC-Module 15-0", "/HPC"],
+  ["Legacy-Module 15-0", "/Legacy"],
+  ["Public-Cloud-Module 15-0", "/Public-Cloud"],
+  ["SAP-Applications-Module 15-0", "/SAP-Applications"],
+  ["Scripting-Module 15-0", "/Scripting"],
+  ["Server-Applications-Module 15-0", "/Server-Applications"]
+]
+
+puts "Repositories to select: " + new_repos.inspect
+
+products = new_repos.map { |r| Y2Packager::ProductLocation.new(r[0], r[1]) }
+dialog = Y2Packager::Dialogs::AddonSelector.new(products)
+
+puts "Dialog result: " + dialog.run.inspect
+puts "Selected products: " + dialog.selected_products.inspect

From 087428a4d06a697313ceba35afb49e03fae366e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.cz>
Date: Fri, 27 Oct 2017 17:52:08 +0200
Subject: [PATCH 3/3] Fixed typo

---
 devel/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devel/README.md b/devel/README.md
index 7c9501600..67d8d9f2f 100644
--- a/devel/README.md
+++ b/devel/README.md
@@ -1,4 +1,4 @@
 # Development Code
 
-This directory contains code examples which is can be useful for development.
+This directory contains code examples which can be useful for development.
 They are not intented for regular use by end users.