Merge pull request #604 from yast/repo_alias

yast · Mar 8, 2022 · 07c1dd0 · 07c1dd0
2 parents fc293fa + 62756c5
commit 07c1dd0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar  8 13:37:35 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
+
+- Properly set the repository alias for the Full medium add-ons
+  (bsc#1193214)
+- 4.4.24
+
 -------------------------------------------------------------------
 Mon Feb 14 09:40:00 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.4.23
+Version:        4.4.24
 Release:        0
 Summary:        YaST2 - Package Library
 License:        GPL-2.0-or-later

diff --git a/src/include/packager/repositories_include.rb b/src/include/packager/repositories_include.rb
@@ -146,7 +146,15 @@ def createSourceImpl(url, plaindir, download, preferred_name, force_alias)
           next
         end
 
-        alias_name = (force_alias == "") ? propose_alias(product.name) : force_alias
+        alias_name = if force_alias != ""
+          force_alias
+        elsif product.media_name && !product.media_name.empty?
+          propose_alias(product.media_name)
+        elsif product.name && !product.name.empty?
+          propose_alias(product.name)
+        end
+
+        alias_name = propose_alias(Packages.fallback_name) if alias_name.empty?
 
         # map with repository parameters: $[ "enabled" : boolean,
         # "autorefresh" : boolean, "raw_name" : string, "alias" : string,