From 9932b0d7c5167215c0cca219e9b919218b9d2dfa Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Sun, 7 Sep 2025 17:32:13 +0200 Subject: svc_openrc2: sync to upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert Günzler --- items/svc_openrc2.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'items') diff --git a/items/svc_openrc2.py b/items/svc_openrc2.py index 5b74f61..2ea419c 100644 --- a/items/svc_openrc2.py +++ b/items/svc_openrc2.py @@ -24,8 +24,7 @@ def svc_enable(node, svcname, runlevel): def svc_enabled(node, svcname, runlevel): result = node.run( - f"rc-update show {quote(runlevel)} | grep -w {quote(svcname)}", - may_fail=True, + f"rc-update show {quote(runlevel)} | grep -w {quote(svcname)}", may_fail=True ) return result.return_code == 0 and svcname in result.stdout_text @@ -57,10 +56,7 @@ class SvcOpenRC2(Item): def __repr__(self): return "".format( - self.name, - self.attributes["runlevel"], - self.attributes["enabled"], - self.attributes["running"], + self.name, self.attributes["runlevel"], self.attributes["enabled"], self.attributes["running"], ) def fix(self, status): @@ -77,8 +73,8 @@ class SvcOpenRC2(Item): svc_stop(self.node, self.name) if "runlevel" in status.keys_to_fix: - if status.sdict["runlevel"]: - svc_disable(self.node, self.name, status.sdict["runlevel"]) + if status.sdict.runlevel: + svc_disable(self.node, self.name, status.sdict.runlevel) svc_enable(self.node, self.name, self.attributes["runlevel"]) def get_canned_actions(self): @@ -119,8 +115,6 @@ class SvcOpenRC2(Item): _( "expected boolean or None for '{attribute}' on {item} in bundle '{bundle}'" ).format( - attribute=attribute, - bundle=bundle.name, - item=item_id, + attribute=attribute, bundle=bundle.name, item=item_id, ) ) -- cgit 1.4.1