From 62756c5a9e4c1807a0d2bfc4af773f1c6d6d27bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 8 Mar 2022 14:38:38 +0100 Subject: [PATCH] Properly set the repository alias (bsc#1193214) ... for the Full medium add-ons - 4.4.24 --- package/yast2-packager.changes | 7 +++++++ package/yast2-packager.spec | 2 +- src/include/packager/repositories_include.rb | 10 +++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes index d377114d..7a079c94 100644 --- 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 + +- 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 diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec index 70c7395a..f7608cac 100644 --- 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 index ef40afc4..e9bb28b8 100644 --- 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,