From d4c07c3d4381276d14938fcc3f97c98240200e70 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Mon, 23 Oct 2023 15:53:17 -0500 Subject: [PATCH] Handle multiple lines in "repoquery" output; also don't shell out just to call head(1) --- yumconf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 yumconf.py diff --git a/yumconf.py b/yumconf.py old mode 100755 new mode 100644 index e67e8db..8f5e7d6 --- a/yumconf.py +++ b/yumconf.py @@ -106,8 +106,8 @@ def yum_clean(self): subprocess.call(["yum", "clean", "all"] + args, stdout=fnull) def _get_yum_major_version(self): - proc = subprocess.Popen("yum --version | head -n1", shell=True, stdout=subprocess.PIPE) - output = to_str(proc.communicate()[0]).strip() + proc = subprocess.Popen(["yum", "--version"], stdout=subprocess.PIPE) + output = to_str(proc.communicate()[0]).strip().splitlines()[0] version = output.split(".") try: return int(version[0]) @@ -125,7 +125,7 @@ def repoquery(self, *args): cmd.extend(self.repo_args) cmd.extend(args) proc = subprocess.Popen(cmd, stdout=subprocess.PIPE) - output = to_str(proc.communicate()[0]) + output = to_str(proc.communicate()[0]).splitlines()[0] retcode = proc.returncode if not retcode: