Accepting request 655559 from network:cluster

OBS-URL: https://build.opensuse.org/request/show/655559
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slurm?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2018-12-07 13:34:03 +00:00 committed by Git OBS Bridge
commit d456564fc2
2 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 5 16:00:50 UTC 2018 - Christian Goll <cgoll@suse.com>
- fixed code in %pretrans section to be compatible with lua 5.1
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 20 11:21:37 UTC 2018 - eich@suse.com Tue Nov 20 11:21:37 UTC 2018 - eich@suse.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -593,8 +593,13 @@ exit 0
} }
%define _test_rest() %{?with_systemd: os.remove("/run/%{1}.rst") %define _test_rest() %{?with_systemd: os.remove("/run/%{1}.rst")
if os.execute() and os.getenv("YAST_IS_RUNNING") ~= "instsys" then if os.execute() and os.getenv("YAST_IS_RUNNING") ~= "instsys" then
if os.execute("systemctl status %{1} &>/dev/null") then local handle = io.popen("systemctl is-enabled %{1} 2>&1")
f=io.open("/run/%{1}.rst","w"); f:close() local str = handle:read("*a"); handle:close()
str = string.gsub(str, '^%%s+', '')
str = string.gsub(str, '%%s+$', '')
str = string.gsub(str, '[\\n\\r]+', ' ')
if str == "enabled" then
local file = io.open("/run/%{1}.rst","w"); file:close()
end end
end end
} }