Merge pull request #293 from yast/fixes

Fixes
yast · Oct 24, 2017 · 2ab9280 · 2ab9280
2 parents d161c3f + 1bc8fea
commit 2ab9280
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 24 15:53:07 UTC 2017 - aschnell@suse.com
+
+- added dependency to yast2-storage-ng (bsc#1062009)
+- 4.0.14
+
 -------------------------------------------------------------------
 Thu Oct 19 10:39:38 UTC 2017 - lslezak@suse.cz
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.0.13
+Version:        4.0.14
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -69,8 +69,9 @@ Requires:       /usr/bin/md5sum
 # .process agent
 Requires:       yast2-core >= 2.16.35
 
-# Storage (methods to check the devicegraph)
-Requires:       libstorage-ng-ruby
+# Storage (requires y2storage)
+Requires:       yast2-storage-ng
+
 # Augeas lenses
 Requires: augeas-lenses
 

diff --git a/src/include/packager/repositories_include.rb b/src/include/packager/repositories_include.rb
@@ -88,6 +88,7 @@ def createSourceImpl(url, plaindir, download, preffered_name, force_alias)
 
       # create a new service if a service is detected at the URL
       if ![nil, "NONE"].include?(service_type)
+        Builtins.y2milestone("Adding a service of type %1...", service_type)
         add_service(url, preffered_name)
         return :ok
       end
@@ -429,8 +430,6 @@ def initialize_progress
     # @param type [String] probed service type
     # @param preffered_name [String] service name, empty string means generate it
     def add_service(url, preffered_name)
-      Builtins.y2milestone("Adding a service of type %1...", service_type)
-
       # all current aliases
       aliases = @serviceStatesOut.map { |s| s["alias"] }