Merge d506ceb into 3048b36

yast · Oct 25, 2022 · 69dde45 · 69dde45
2 parents 3048b36 + d506ceb
commit 69dde45
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 25 08:37:56 UTC 2022 - Steffen Winterfeldt <snwint@suse.com>
+
+- support 'repo' scheme for add-ons (jsc#SLE-22578, jsc#SLE-24584)
+- 4.5.2
+
 -------------------------------------------------------------------
 Tue Jun  7 16:19:52 UTC 2022 - 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.5.1
+Version:        4.5.2
 Release:        0
 Summary:        YaST2 - Add-On media installation code
 License:        GPL-2.0-only

diff --git a/src/lib/add-on/clients/add-on_auto.rb b/src/lib/add-on/clients/add-on_auto.rb
@@ -262,7 +262,7 @@ def create_source(add_on, product, media_url)
     def media_url_for(add_on)
       media_url = add_on.fetch("media_url", "")
 
-      if media_url.downcase.start_with?("relurl://")
+      if ["relurl", "repo"].include?(URI(media_url).scheme)
         media_url = AddOnProduct.GetAbsoluteURL(AddOnProduct.GetBaseProductURL, media_url)
 
         log.info("relurl changed to #{media_url}")