Hello community,
here is the log from the commit of package yast2-add-on for openSUSE:Factory
checked in at 2018-03-26 12:15:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old)
and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on"
Mon Mar 26 12:15:35 2018 rev:90 rq:590327 version:4.0.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes
2018-02-12 10:06:59.003304391 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes
2018-03-26 12:15:41.307677387 +0200
@@ -1,0 +2,7 @@
+Thu Mar 22 13:24:31 CET 2018 - sch...@suse.de
+
+- AutoYaST: Reporting missing AY configuration file entries.
+ (bnc#1084596)
+- 4.0.7
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-4.0.6.tar.bz2
New:
----
yast2-add-on-4.0.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.2UVAg1/_old 2018-03-26 12:15:42.347640101 +0200
+++ /var/tmp/diff_new_pack.2UVAg1/_new 2018-03-26 12:15:42.351639958 +0200
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 4.0.6
+Version: 4.0.7
Release: 0
Summary: YaST2 - Add-On media installation code
License: GPL-2.0
++++++ yast2-add-on-4.0.6.tar.bz2 -> yast2-add-on-4.0.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-4.0.6/package/yast2-add-on.changes
new/yast2-add-on-4.0.7/package/yast2-add-on.changes
--- old/yast2-add-on-4.0.6/package/yast2-add-on.changes 2018-02-09
10:29:03.000000000 +0100
+++ new/yast2-add-on-4.0.7/package/yast2-add-on.changes 2018-03-22
14:52:06.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Mar 22 13:24:31 CET 2018 - sch...@suse.de
+
+- AutoYaST: Reporting missing AY configuration file entries.
+ (bnc#1084596)
+- 4.0.7
+
+-------------------------------------------------------------------
Wed Feb 7 15:48:56 UTC 2018 - mvid...@suse.com
- Made the addon=url boot option work with a multi-product medium
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-4.0.6/package/yast2-add-on.spec
new/yast2-add-on-4.0.7/package/yast2-add-on.spec
--- old/yast2-add-on-4.0.6/package/yast2-add-on.spec 2018-02-09
10:29:03.000000000 +0100
+++ new/yast2-add-on-4.0.7/package/yast2-add-on.spec 2018-03-22
14:52:06.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 4.0.6
+Version: 4.0.7
Release: 0
Summary: YaST2 - Add-On media installation code
License: GPL-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-4.0.6/src/autoyast-rnc/add-on.rnc
new/yast2-add-on-4.0.7/src/autoyast-rnc/add-on.rnc
--- old/yast2-add-on-4.0.6/src/autoyast-rnc/add-on.rnc 2018-02-09
10:29:03.000000000 +0100
+++ new/yast2-add-on-4.0.7/src/autoyast-rnc/add-on.rnc 2018-03-22
14:52:06.000000000 +0100
@@ -6,7 +6,7 @@
element add-on { add_on_products* }
listentry =
element listentry {
- media_url? &
+ media_url & # here it is mandatory
product? &
name? &
alias? &
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-4.0.6/src/clients/add-on_auto.rb
new/yast2-add-on-4.0.7/src/clients/add-on_auto.rb
--- old/yast2-add-on-4.0.6/src/clients/add-on_auto.rb 2018-02-09
10:29:03.000000000 +0100
+++ new/yast2-add-on-4.0.7/src/clients/add-on_auto.rb 2018-03-22
14:52:06.000000000 +0100
@@ -56,9 +56,26 @@
Builtins.y2debug("param=%1", @param)
if @func == "Import"
- @ret = AddOnProduct.Import(
- Convert.convert(@param, :from => "map", :to => "map <string, any>")
- )
+ add_on_products = @param["add_on_products"] || []
+ count = 0
+ # Checking needed values
+ add_on_products.reject! do |product|
+ count += 1
+ if product["media_url"].nil? || product["media_url"] == ""
+ # Report missing media_url entry in the AutoYaST configuration file
+ # TRANSLATORS: The placeholder points to the location in the
AutoYaST configuration file.
+ error_string = format(_("Error in the AutoYaST <add_on>
section.\n" \
+ "Missing mandatory <media_url> value at index %d in the
<add_on_products> definition.\n" \
+ "Skip the invalid product definition and continue with the
installation?"),
+ count)
+ log.error "Missing <media_url> value in the #{count}.
add-on-product definition"
+ return false unless Popup.ContinueCancel(error_string) # user abort
+ true
+ else
+ false
+ end
+ end
+ @ret = AddOnProduct.Import("add_on_products"=>add_on_products)
# Create a summary
# return string
elsif @func == "Summary"
@@ -197,7 +214,8 @@
# just report an error
# TRANSLATORS: The placeholders are for the product name and
the URL.
error_string = format(_("Failed to add product \"%s\"
via\n%s."),
- prod["product"], media)
+ # TRANSLATORS: a fallback string for undefined product name
+ prod["product"] || _("<not_defined_name>"), media)
Report.Error(error_string)
end
elsif Ops.get_boolean(prod, "confirm_license", false)
