Merge 067d1ab into dcda2c7

yast · Jun 17, 2021 · 8bc506e · 8bc506e
2 parents dcda2c7 + 067d1ab
commit 8bc506e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun 17 15:47:33 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
+
+- When editing a repository display the repository alias as a
+  fallback if the repository name is not set, do not display
+  empty name (bsc#1184935)
+- 4.3.24
+
 -------------------------------------------------------------------
 Tue Jun 15 09:17:24 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

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

diff --git a/src/lib/packager/clients/repositories.rb b/src/lib/packager/clients/repositories.rb
@@ -1791,7 +1791,12 @@ def repo_replace_handler(source_state, global_current)
       old_url = url2
       plaindir = Ops.get_string(generalData, "type", "YaST") == @plaindir_type
 
-      SourceDialogs.SetRepoName(source_state.fetch("raw_name", ""))
+      repo_name = source_state.fetch("raw_name", "")
+      # if the repository does not define a name then "raw_name" is empty,
+      # display "name" which contains the repository alias in that case
+      repo_name = source_state.fetch("name", "") if repo_name.empty?
+
+      SourceDialogs.SetRepoName(repo_name)
 
       begin
         url2 = SourceDialogs.EditPopupType(url2, plaindir)