Merge 6bdad68 into ca521b8

library/systemd/src/lib/yast2/systemctl.rb

@@ -2,6 +2,10 @@
 require "timeout"
 require "shellwords"
 
+require "yast"
+
+Yast.import "Systemd"
+
 module Yast2
   # Wrapper around `systemctl` command.
   # - uses non-interactive flags
@@ -82,12 +86,22 @@ def target_units
     private
 
       def list_unit_files(type: nil)
+        if !Yast::Systemd.Running
+          log.info "systemd not running. Returning empty list"
+          return ""
+        end
+
         command = " list-unit-files "
         command << " --type=#{type.to_s.shellescape} " if type
         execute(command).stdout
       end
 
       def list_units(type: nil, all: true)
+        if !Yast::Systemd.Running
+          log.info "systemd not running. Returning empty list"
+          return ""
+        end
+
         command = " list-units "
         command << " --all " if all
         command << " --type=#{type.to_s.shellescape} " if type

library/systemd/test/yast2/systemctl_test.rb

@@ -7,6 +7,10 @@ module Yast2
   describe Systemctl do
     include SystemctlStubs
 
+    before do
+      allow(Yast::Systemd).to receive(:Running).and_return(true)
+    end
+
     describe ".execute" do
       it "returns a struct with command results" do
         expect(Yast::SCR).to receive(:Execute).and_return(

package/yast2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 29 13:22:50 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Speed up run on WSL (bsc#1157575)
+- 4.2.61
+
 -------------------------------------------------------------------
 Tue Jan 28 08:42:45 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
 

package/yast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.2.60
+Version:        4.2.61
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only