Merge pull request #295 from yast/review_140917_nil_repository_name

[Review] Request from 'schubi2' @ 'yast/yast-yast2/review_140917_nil_repository_name'
yast · Sep 17, 2014 · be81600 · be81600
2 parents 2122662 + 63ffa81
commit be81600
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/library/packages/src/modules/SignatureCheckDialogs.rb b/library/packages/src/modules/SignatureCheckDialogs.rb
@@ -974,7 +974,7 @@ def ImportGPGKeyIntoTrustedDialog(key, repository)
             "(%2):"
         ),
         Ops.get_locale(repo, "name", _("Unknown")),
-        repo["url"] ? repo["url"].scan(/.{1,59}/).join("\n") :
+        repo && repo["url"] ? repo["url"].scan(/.{1,59}/).join("\n") :
           _("Unknown")
       )
 

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 17 09:16:23 CEST 2014 - schubi@suse.de
+
+- Checking nil for repository name. (bnc#896466)
+- 3.1.107
+
 -------------------------------------------------------------------
 Tue Sep 16 12:58:53 UTC 2014 - ancor@suse.com
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.106
+Version:        3.1.107
 Release:        0
 URL:            https://github.com/yast/yast-yast2