From 4dabd925df0a5ddd9b246c4cf4125c5d5fc8bb08 Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Thu, 14 Sep 2017 09:54:39 +0200 Subject: [PATCH] Revert to using separate property options to keep old tests working. yast2-dhcp-server and yast2-samba-server log the exact command used by us in their tests :-( --- library/systemd/src/lib/yast2/systemd_unit.rb | 3 ++- package/yast2.changes | 7 +++++++ package/yast2.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/library/systemd/src/lib/yast2/systemd_unit.rb b/library/systemd/src/lib/yast2/systemd_unit.rb index 87d8fbe05..99d15cf5f 100644 --- a/library/systemd/src/lib/yast2/systemd_unit.rb +++ b/library/systemd/src/lib/yast2/systemd_unit.rb @@ -255,7 +255,8 @@ def extract_properties def load_systemd_properties names = systemd_unit.propmap.values - systemd_unit.command("show", options: "--property=" + names.join(",")) + opts = names.map { |property_name| " --property=#{property_name} " } + systemd_unit.command("show", options: opts.join) end end diff --git a/package/yast2.changes b/package/yast2.changes index 3f52881d4..ab86193ed 100644 --- a/package/yast2.changes +++ b/package/yast2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 14 07:51:58 UTC 2017 - mvidner@suse.com + +- systemd services (bsc#1045658) + - reverted a command change that broke brittle tests +- 3.2.37.3 + ------------------------------------------------------------------- Wed Aug 30 13:29:54 UTC 2017 - mvidner@suse.com diff --git a/package/yast2.spec b/package/yast2.spec index c396f0122..d07807aaf 100644 --- a/package/yast2.spec +++ b/package/yast2.spec @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.2.37.2 +Version: 3.2.37.3 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0