Merge pull request #373 from yast/service_nil_check

Added nil service check (bsc#1106837)
yast · Sep 3, 2018 · 43b6e03 · 43b6e03
2 parents d6fb5cf + d53a37e
commit 43b6e03
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep  3 12:18:14 UTC 2018 - lslezak@suse.cz
+
+- Fixed service check for the newly added repositories in the
+  repository manager (bsc#1106837)
+- 4.1.4
+
 -------------------------------------------------------------------
 Fri Aug 31 14:03:43 UTC 2018 - snwint@suse.com
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.1.3
+Version:        4.1.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/packager/clients/repositories.rb b/src/lib/packager/clients/repositories.rb
@@ -2078,7 +2078,7 @@ def warn_service_repository(source_state)
       msg = _("Repository '%{name}' is managed by service '%{service}'.\n"\
         "Your manual changes might be reset by the next service refresh!") %
         { name: source_state["name"], service: source_state["service"] }
-      if source_state["service"] != "" && !@services_repos.include?(source_state["SrcId"])
+      if !source_state["service"].to_s.empty? && !@services_repos.include?(source_state["SrcId"])
         Popup.Warning(msg)
         @services_repos.push(source_state["SrcId"])
       end