Merge c6cd382 into 85a2ea7

yast · Jul 26, 2019 · 127aea6 · 127aea6
2 parents 85a2ea7 + c6cd382
commit 127aea6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 26 12:27:45 CEST 2019 - schubi@suse.de
+
+- AY: Adapted docu regarding <add_on_others> flag (bsc#1125411).
+- 4.2.4
+
 -------------------------------------------------------------------
 Thu Jul 25 08:40:00 UTC 2019 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-add-on
-Version:        4.2.2
+Version:        4.2.4
 Release:        0
 Summary:        YaST2 - Add-On media installation code
 License:        GPL-2.0-only

diff --git a/src/autoyast-rnc/add-on.rnc b/src/autoyast-rnc/add-on.rnc
@@ -52,11 +52,23 @@ product_dir = element product_dir { text }
 ask_on_error = element ask_on_error { BOOLEAN }
 confirm_license = element confirm_license { BOOLEAN }
 priority = element priority { INTEGER }
+#
+# Describes all Add-On products which have to be added
+# while and after the installation.
+#
 add_on_products =
   element add_on_products {
      attribute config:type { text }?,
      listentry*
   }
+#
+# Describes all Add-Ons which are not Add-On-Products or Base-Products.
+# Usually custom or 3rd party repositories.
+#
+# Add-On products and other user defined repos will be split in order to
+#  1. keep a better overview about the repos
+#  2. ensure backward compatibility
+#
 add_on_others =
   element add_on_others {
      attribute config:type { text }?,

diff --git a/src/modules/AddOnOthers.rb b/src/modules/AddOnOthers.rb
@@ -4,7 +4,8 @@
 
 # Yast namespace
 module Yast
-  # This module provides integration of the add-on products
+  # Describes all Add-Ons which are not Add-On-Products or Base-Products.
+  # Usually custom or 3rd party repositories.
 
   class AddOnOthersClass < Module