mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-19 03:53:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2020-12-17 17:05:04 +00:00
parent f6cae12f60 708d3ab5cd
commit 9bc02961d3
9 changed files with 153 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui-apps/wofi/Manifest Normal file
View File

@@ -0,0 +1,3 @@
DIST v1.2.1.tar.gz 71338 BLAKE2B 0c1e4800ab669c9f73b33a751ba116a9f45eade6c2ae3211e65be39f1961b34a51412700f98f7ea77a1bac38d9dcd02c7406e5f46b684980a223e8d638aeb0ad SHA512 b16ffcd83fdaa0029c3a32b08202a31b7ebe29dc0b1ac0cd95b6f7079f4b612db475fbba8751fdf682aeb30acc502f8985289f6b763a44ded3c8b0c0c26afcc7
DIST v1.2.2.tar.gz 71374 BLAKE2B b395c789159685359696078443f3952fd2f164dc8290ed15b6e76e3020446ccbedceb1b433d7b23accc99a21d4225fa91b9e2432c109ed276d1e465c73a30871 SHA512 24bf7dcce439450716edc374db8a1f41f86873305f081f880b60d0220370c777c9e585875c74b26aba4b9ba22e683832cb3898b99a7b98c75bfec2d7253b081c
DIST v1.2.3.tar.gz 71425 BLAKE2B 88f6911b6fb5cb4a3fcbd6f79e004ceaed1f36b0b236c4ddbd2ef42a6b7eab0319477a5eaa5a7c5935e44793e76e0346455718cec93ca457dfd9ffb76172c21e SHA512 613df12ff3da401d8ca661937cb7a8403ef23ceec328cf45e91b9da8ff6e64f4f669e7052b71c30f4560c975937c18d8912ee55a60bd32ace7498357ab0a8d5a

23
gui-apps/wofi/wofi-1.2.1.ebuild
View File

@@ -6,17 +6,19 @@ EAPI=7
# Upstream's tarballs are timestamped (https://todo.sr.ht/~sircmpwn/hg.sr.ht/33).
# This makes them impossible to validate, so every version has a live ebuild.
EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
inherit meson mercurial
case "${PV}" in
"9999")
;;
*)
EHG_REVISION="v${PV}"
esac
inherit meson
if [ "${PV}" = 9999 ]
then
inherit mercurial
EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
else
SRC_URI="https://hg.sr.ht/~scoopta/wofi/archive/v${PV}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
KEYWORDS="~amd64"
fi
DESCRIPTION="Wofi is a launcher/menu program for wlroots based wayland compositors like sway"
HOMEPAGE="${EHG_REPO_URI}"
HOMEPAGE="https://hg.sr.ht/~scoopta/wofi"
LICENSE="GPL-3"
DEPEND="
@@ -25,7 +27,6 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
RESTRICT="test"
RESTRICT="test mirror"
SLOT="0"
KEYWORDS=""

23
gui-apps/wofi/wofi-1.2.2.ebuild
View File

@@ -6,17 +6,19 @@ EAPI=7
# Upstream's tarballs are timestamped (https://todo.sr.ht/~sircmpwn/hg.sr.ht/33).
# This makes them impossible to validate, so every version has a live ebuild.
EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
inherit meson mercurial
case "${PV}" in
"9999")
;;
*)
EHG_REVISION="v${PV}"
esac
inherit meson
if [ "${PV}" = 9999 ]
then
inherit mercurial
EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
else
SRC_URI="https://hg.sr.ht/~scoopta/wofi/archive/v${PV}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
KEYWORDS="~amd64"
fi
DESCRIPTION="Wofi is a launcher/menu program for wlroots based wayland compositors like sway"
HOMEPAGE="${EHG_REPO_URI}"
HOMEPAGE="https://hg.sr.ht/~scoopta/wofi"
LICENSE="GPL-3"
DEPEND="
@@ -25,7 +27,6 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
RESTRICT="test"
RESTRICT="test mirror"
SLOT="0"
KEYWORDS=""

23
gui-apps/wofi/wofi-1.2.3.ebuild
View File

@@ -6,17 +6,19 @@ EAPI=7
# Upstream's tarballs are timestamped (https://todo.sr.ht/~sircmpwn/hg.sr.ht/33).
# This makes them impossible to validate, so every version has a live ebuild.
EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
inherit meson mercurial
case "${PV}" in
"9999")
;;
*)
EHG_REVISION="v${PV}"
esac
inherit meson
if [ "${PV}" = 9999 ]
then
inherit mercurial
EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
else
SRC_URI="https://hg.sr.ht/~scoopta/wofi/archive/v${PV}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
KEYWORDS="~amd64"
fi
DESCRIPTION="Wofi is a launcher/menu program for wlroots based wayland compositors like sway"
HOMEPAGE="${EHG_REPO_URI}"
HOMEPAGE="https://hg.sr.ht/~scoopta/wofi"
LICENSE="GPL-3"
DEPEND="
@@ -25,7 +27,6 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
RESTRICT="test"
RESTRICT="test mirror"
SLOT="0"
KEYWORDS=""

23
gui-apps/wofi/wofi-9999.ebuild
View File

@@ -6,17 +6,19 @@ EAPI=7
# Upstream's tarballs are timestamped (https://todo.sr.ht/~sircmpwn/hg.sr.ht/33).
# This makes them impossible to validate, so every version has a live ebuild.
EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
inherit meson mercurial
case "${PV}" in
"9999")
;;
*)
EHG_REVISION="v${PV}"
esac
inherit meson
if [ "${PV}" = 9999 ]
then
inherit mercurial
EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
else
SRC_URI="https://hg.sr.ht/~scoopta/wofi/archive/v${PV}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
KEYWORDS="~amd64"
fi
DESCRIPTION="Wofi is a launcher/menu program for wlroots based wayland compositors like sway"
HOMEPAGE="${EHG_REPO_URI}"
HOMEPAGE="https://hg.sr.ht/~scoopta/wofi"
LICENSE="GPL-3"
DEPEND="
@@ -25,7 +27,6 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
RESTRICT="test"
RESTRICT="test mirror"
SLOT="0"
KEYWORDS=""

1
media-video/wlrobs/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST v1.0.tar.gz 54998 BLAKE2B b4e3975d9bc7b0b8dc5721448b29aa95a2c17284fbab5db738ede9998ae9add2a984fa1f1e1d9fa5fe281cef58edd0dd525a358f12c3271cad9a357a101a7b48 SHA512 846f0c0ca780296c2704bfc05c96dd1cb9579bcd29b24abe03567abad4c3d8276712c524e79080c8f0632726ad3b6b1e793d4cea0a81a1aa3e7689595fec01cf

47
media-video/wlrobs/wlrobs-1.0.ebuild Normal file
View File

@@ -0,0 +1,47 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit meson
if [ "${PV}" == 9999 ]
then
inherit mercurial
EHG_REPO_URI="https://hg.sr.ht/~scoopta/wlrobs"
else
SRC_URI="https://hg.sr.ht/~scoopta/wlrobs/archive/v${PV}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
KEYWORDS="~amd64"
fi
DESCRIPTION="OBS plugin that allows you to screen capture on wlroots based compositors"
HOMEPAGE="https://hg.sr.ht/~scoopta/wlrobs"
LICENSE="GPL-3"
SLOT="0"
IUSE="+dmabuf +scpy"
RESTRICT="mirror"
RDEPEND="
dev-libs/wayland
media-video/obs-studio
dmabuf? ( x11-libs/libdrm )
"
DEPEND="${RDEPEND}"
src_configure() {
local emesonargs=(
$(meson_use dmabuf use_dmabuf)
$(meson_use scpy use_scpy )
)
meson_src_configure
}
src_install() {
exeinto "/usr/lib64/obs-plugins"
doexe "$BUILD_DIR/libwlrobs.so"
}

14
media-video/wlrobs/wlrobs-9999.ebuild
View File

@@ -3,16 +3,24 @@
EAPI=7
inherit mercurial meson
inherit meson
if [ "${PV}" == 9999 ]
then
inherit mercurial
EHG_REPO_URI="https://hg.sr.ht/~scoopta/wlrobs"
else
SRC_URI="https://hg.sr.ht/~scoopta/wlrobs/archive/v${PV}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
KEYWORDS="~amd64"
fi
DESCRIPTION="OBS plugin that allows you to screen capture on wlroots based compositors"
HOMEPAGE="https://hg.sr.ht/~scoopta/wlrobs"
EHG_REPO_URI="https://hg.sr.ht/~scoopta/wlrobs"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
IUSE="+dmabuf +scpy"

74
sys-cluster/pcs/files/openrc-0.10.7.patch
View File

@@ -84,16 +84,15 @@ diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_default.py
--- pcs-0.10.7/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100
+++ pcs-0.10.7-openrc/pcs/settings_default.py 2020-12-16 10:21:42.110032722 +0100
+++ pcs-0.10.7-openrc/pcs/settings_default.py 2020-12-16 21:59:28.541361537 +0100
@@ -1,8 +1,8 @@
import os.path
-systemctl_binary = "/bin/systemctl"
systemctl_binary = "/bin/systemctl"
-chkconfig_binary = "/sbin/chkconfig"
-service_binary = "/sbin/service"
+systemctl_binary="/bin/systemctl"
+rc_config_binary="/usr/bin/rc-config"
+rc_service_binary="/sbin/rc-service"
+rc_config_binary = "/usr/bin/rc-config"
+rc_service_binary = "/sbin/rc-service"
pacemaker_binaries = "/usr/sbin/"
crm_resource_binary = os.path.join(pacemaker_binaries, "crm_resource")
corosync_binaries = "/usr/sbin/"
@@ -136,13 +135,13 @@ diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.d
pcsd_config = "/etc/default/pcsd"
diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
--- pcs-0.10.7/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100
+++ pcs-0.10.7-openrc/pcs/utils.py 2020-12-15 17:36:27.914500816 +0100
+++ pcs-0.10.7-openrc/pcs/utils.py 2020-12-16 21:57:09.487686936 +0100
@@ -2187,7 +2187,7 @@
)
else:
stdout, stderr, retval = cmd_runner().run(
- [settings.service_binary, service, "start"]
+ [settings.rc-service_binary, service, "start"]
+ [settings.rc_service_binary, service, "start"]
)
return join_multilines([stderr, stdout]), retval
@@ -151,13 +150,13 @@ diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
else:
stdout, stderr, retval = cmd_runner().run(
- [settings.service_binary, service, "stop"]
+ [settings.rc-service_binary, service, "stop"]
+ [settings.rc_service_binary, service, "stop"]
)
return join_multilines([stderr, stdout]), retval
diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
--- pcs-0.10.7/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100
+++ pcs-0.10.7-openrc/pcsd/pcs.rb 2020-12-16 09:19:41.341318599 +0100
+++ pcs-0.10.7-openrc/pcsd/pcs.rb 2020-12-16 21:54:52.337982100 +0100
@@ -1708,11 +1708,22 @@
def is_service_enabled?(service)
if ISSYSTEMCTL
@@ -198,7 +197,7 @@ diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
protected
def run_command
- return run_cmd(PCSAuth.getSuperuserAuth(), 'chkconfig')
+ cmd = ['/usr/bin/rc-config', 'list']
+ cmd = ['rc-config', 'list']
+ return run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
end
@@ -239,6 +238,7 @@ diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
end
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
return (retcode == 0)
I file binari pcs-0.10.7/pcsd/.pcs.rb.swp e pcs-0.10.7-openrc/pcsd/.pcs.rb.swp sono diversi
diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
--- pcs-0.10.7/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100
+++ pcs-0.10.7-openrc/pcsd/settings.rb 2020-12-16 09:26:46.782426991 +0100
@@ -247,21 +247,33 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
PCSD_VAR_LOCATION = '/var/lib/pcsd/'
PCSD_DEFAULT_PORT = 2224
-PCSD_RUBY_SOCKET = '/run/pcsd-ruby.socket'
+PCSD_RUBY_SOCKET = '/run/pcsd-daemon.socket'
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb.debian
--- pcs-0.10.7/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100
+++ pcs-0.10.7-openrc/pcsd/settings.rb.debian 2020-12-16 18:52:24.289921676 +0100
@@ -3,7 +3,7 @@
PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
PCSD_VAR_LOCATION = '/var/lib/pcsd/'
PCSD_DEFAULT_PORT = 2224
-PCSD_RUBY_SOCKET = '/run/pcsd-ruby.socket'
+PCSD_RUBY_SOCKET = '/run/pcsd-daemon.socket'
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py
--- pcs-0.10.7/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100
+++ pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py 2020-12-15 17:44:33.382213643 +0100
+++ pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py 2020-12-16 21:52:40.531155033 +0100
@@ -16,8 +16,8 @@
import pcs.lib.external as lib
-_chkconfig = settings.chkconfig_binary
-_service = settings.service_binary
+_rc-config = settings.rc-config_binary
+_rc-service = settings.rc-service_binary
+_rc_config = settings.rc_config_binary
+_rc_service = settings.rc_service_binary
_systemctl = settings.systemctl_binary
@@ -270,7 +282,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
)
self.mock_runner.run.assert_called_once_with(
- [_chkconfig, self.service, "off"]
+ [_rc-config, "delete", self.service, "default"]
+ [_rc_config, "delete", self.service, "default"]
)
def test_not_systemctl_failed(self, mock_is_installed, mock_systemctl):
@@ -279,7 +291,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
)
self.mock_runner.run.assert_called_once_with(
- [_chkconfig, self.service, "off"]
+ [_rc-config, "delete", self.service, "default"]
+ [_rc_config, "delete", self.service, "default"]
)
def test_systemctl_not_installed(self, mock_is_installed, mock_systemctl):
@@ -288,7 +300,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
)
self.mock_runner.run.assert_called_once_with(
- [_chkconfig, self.service, "off"]
+ [_rc-config, "delete", self.service, "default"]
+ [_rc_config, "delete", self.service, "default"]
)
@@ -297,7 +309,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
lib.enable_service(self.mock_runner, self.service)
self.mock_runner.run.assert_called_once_with(
- [_chkconfig, self.service, "on"]
+ [_rc-config, "add", self.service, "default"]
+ [_rc_config, "add", self.service, "default"]
)
def test_not_systemctl_failed(self, mock_systemctl):
@@ -306,7 +318,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
)
self.mock_runner.run.assert_called_once_with(
- [_chkconfig, self.service, "on"]
+ [_rc-config, "add", self.service, "default"]
+ [_rc_config, "add", self.service, "default"]
)
def test_instance_systemctl(self, mock_systemctl):
@@ -315,7 +327,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
lib.enable_service(self.mock_runner, self.service, instance="test")
self.mock_runner.run.assert_called_once_with(
- [_chkconfig, self.service, "on"]
+ [_rc-config, "add", self.service, "default"]
+ [_rc_config, "add", self.service, "default"]
)
@@ -324,7 +336,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
lib.start_service(self.mock_runner, self.service)
self.mock_runner.run.assert_called_once_with(
- [_service, self.service, "start"]
+ [_rc-service, self.service, "start"]
+ [_rc_service, self.service, "start"]
)
def test_not_systemctl_failed(self, mock_systemctl):
@@ -333,7 +345,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
)
self.mock_runner.run.assert_called_once_with(
- [_service, self.service, "start"]
+ [_rc-service, self.service, "start"]
+ [_rc_service, self.service, "start"]
)
def test_instance_systemctl(self, mock_systemctl):
@@ -342,7 +354,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
lib.start_service(self.mock_runner, self.service, instance="test")
self.mock_runner.run.assert_called_once_with(
- [_service, self.service, "start"]
+ [_rc-service, self.service, "start"]
+ [_rc_service, self.service, "start"]
)
@@ -351,7 +363,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
lib.stop_service(self.mock_runner, self.service)
self.mock_runner.run.assert_called_once_with(
- [_service, self.service, "stop"]
+ [_rc-service, self.service, "stop"]
+ [_rc_service, self.service, "stop"]
)
def test_not_systemctl_failed(self, mock_systemctl):
@@ -360,7 +372,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
)
self.mock_runner.run.assert_called_once_with(
- [_service, self.service, "stop"]
+ [_rc-service, self.service, "stop"]
+ [_rc_service, self.service, "stop"]
)
def test_instance_systemctl(self, mock_systemctl):
@@ -369,7 +381,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
lib.stop_service(self.mock_runner, self.service, instance="test")
self.mock_runner.run.assert_called_once_with(
- [_service, self.service, "stop"]
+ [_rc-service, self.service, "stop"]
+ [_rc_service, self.service, "stop"]
)
@@ -378,14 +390,14 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
self.mock_runner.run.return_value = ("", "", 0)
self.assertTrue(lib.is_service_enabled(self.mock_runner, self.service))
- self.mock_runner.run.assert_called_once_with([_chkconfig, self.service])
+ self.mock_runner.run.assert_called_once_with([_rc-config, self.service])
+ self.mock_runner.run.assert_called_once_with([_rc_config, self.service])
def test_not_systemctl_disabled(self, mock_systemctl):
mock_systemctl.return_value = False
self.mock_runner.run.return_value = ("", "", 3)
self.assertFalse(lib.is_service_enabled(self.mock_runner, self.service))
- self.mock_runner.run.assert_called_once_with([_chkconfig, self.service])
+ self.mock_runner.run.assert_called_once_with([_rc-config, self.service])
+ self.mock_runner.run.assert_called_once_with([_rc_config, self.service])
@mock.patch("pcs.lib.external.is_systemctl")
@@ -394,7 +406,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
self.assertTrue(lib.is_service_running(self.mock_runner, self.service))
self.mock_runner.run.assert_called_once_with(
- [_service, self.service, "status"]
+ [_rc-service, self.service, "status"]
+ [_rc_service, self.service, "status"]
)
def test_not_systemctl_not_running(self, mock_systemctl):
@@ -403,7 +415,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
self.assertFalse(lib.is_service_running(self.mock_runner, self.service))
self.mock_runner.run.assert_called_once_with(
- [_service, self.service, "status"]
+ [_rc-service, self.service, "status"]
+ [_rc_service, self.service, "status"]
)
@@ -412,7 +424,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
)
self.assertEqual(mock_is_systemctl.call_count, 1)
- self.mock_runner.run.assert_called_once_with([_chkconfig])
+ self.mock_runner.run.assert_called_once_with([_rc-config])
+ self.mock_runner.run.assert_called_once_with([_rc_config])
def test_failed(self, mock_is_systemctl):
mock_is_systemctl.return_value = False
@@ -420,7 +432,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
self.assertEqual(lib.get_non_systemd_services(self.mock_runner), [])
self.assertEqual(mock_is_systemctl.call_count, 1)
- self.mock_runner.run.assert_called_once_with([_chkconfig])
+ self.mock_runner.run.assert_called_once_with([_rc-config])
+ self.mock_runner.run.assert_called_once_with([_rc_config])
def test_systemd(self, mock_is_systemctl):
mock_is_systemctl.return_value = True