62 lines
2.9 KiB
Diff
62 lines
2.9 KiB
Diff
From d83a8eb7f0b830408659483922eca25b51bd7b5e Mon Sep 17 00:00:00 2001
|
|
From: Anubhav Shelat <ashelat@redhat.com>
|
|
Date: Thu, 1 Jun 2023 16:27:33 -0400
|
|
Subject: rteval: Use f-strings in services.py
|
|
|
|
Use f-strings in services.py
|
|
|
|
Signed-off-by: Anubhav Shelat <ashelat@redhat.com>
|
|
Signed-off-by: John Kacur <jkacur@redhat.com>
|
|
---
|
|
rteval/sysinfo/services.py | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/rteval/sysinfo/services.py b/rteval/sysinfo/services.py
|
|
index c85980e19165..a87b4abeea76 100644
|
|
--- a/rteval/sysinfo/services.py
|
|
+++ b/rteval/sysinfo/services.py
|
|
@@ -55,17 +55,17 @@ class SystemServices:
|
|
break
|
|
if not servicesdir:
|
|
raise RuntimeError("No services dir (init.d) found on your system")
|
|
- self.__log(Log.DEBUG, "Services located in %s, going through each service file to check status" % servicesdir)
|
|
+ self.__log(Log.DEBUG, f"Services located in {servicesdir}, going through each service file to check status")
|
|
ret_services = {}
|
|
for service in glob.glob(os.path.join(servicesdir, '*')):
|
|
servicename = os.path.basename(service)
|
|
if not [1 for p in reject if fnmatch.fnmatch(servicename, p)] \
|
|
and os.access(service, os.X_OK):
|
|
- cmd = '%s -qs "\(^\|\W\)status)" %s' % (getcmdpath('grep'), service)
|
|
+ cmd = f'{getcmdpath("grep")} -qs "\(^\|\W\)status)" {service}'
|
|
c = subprocess.Popen(cmd, shell=True, encoding='utf-8')
|
|
c.wait()
|
|
if c.returncode == 0:
|
|
- cmd = ['env', '-i', 'LANG="%s"' % os.environ['LANG'], 'PATH="%s"' % os.environ['PATH'], 'TERM="%s"' % os.environ['TERM'], service, 'status']
|
|
+ cmd = ['env', '-i', f'LANG="{os.environ["LANG"]}"', f'PATH="{os.environ["PATH"]}"', f'TERM="{os.environ["TERM"]}"', service, 'status']
|
|
c = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf-8')
|
|
c.wait()
|
|
if c.returncode == 0 and (c.stdout.read() or c.stderr.read()):
|
|
@@ -79,8 +79,8 @@ class SystemServices:
|
|
|
|
def __get_services_systemd(self):
|
|
ret_services = {}
|
|
- cmd = '%s list-unit-files -t service --no-legend' % getcmdpath('systemctl')
|
|
- self.__log(Log.DEBUG, "cmd: %s" % cmd)
|
|
+ cmd = f'{getcmdpath("systemctl")} list-unit-files -t service --no-legend'
|
|
+ self.__log(Log.DEBUG, f"cmd: {cmd}")
|
|
c = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf-8')
|
|
for p in c.stdout:
|
|
# p are lines like b'servicename.service status'
|
|
@@ -133,7 +133,7 @@ def unit_test(rootdir):
|
|
|
|
return 0
|
|
except Exception as err:
|
|
- print("** EXCEPTION: %s" % str(err))
|
|
+ print(f"** EXCEPTION: {str(err)}")
|
|
return 1
|
|
|
|
|
|
--
|
|
2.40.1
|
|
|