From 0c1c31c67785507a9947ce2fa44105ea758d4e2c Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Nov 09 2020 00:16:42 +0000 Subject: create-review: refactor Popen calls --- diff --git a/src/FedoraReview/create_review.py b/src/FedoraReview/create_review.py index 7eaa506..0a6cea3 100644 --- a/src/FedoraReview/create_review.py +++ b/src/FedoraReview/create_review.py @@ -244,10 +244,11 @@ class ReviewRequest(object): return self.create_review_request(rename_request) return bug - def do_scratch_build(self, target="rawhide"): - """ Starts a scratch build on koji. """ - print("Starting scratch build") - cmd = ["koji", "build", "--scratch", target, self.srpmfile] + def run_command(self, cmd): + """ Run a command and return the output + + :arg cmd, the command to run + """ self.log.debug(cmd) try: proc = Popen( @@ -259,8 +260,15 @@ class ReviewRequest(object): output = proc.communicate()[0] except OSError as err: print("OSError : %s" % str(err)) + return (output, proc.returncode) + def do_scratch_build(self, target="rawhide"): + """ Starts a scratch build on koji. """ + print("Starting scratch build") + cmd = ["koji", "build", "--scratch", target, self.srpmfile] + return run_command(cmd) + def fill_urls(self): """ Fill the spec and src.rpm urls into the info table using the info in the settings. @@ -388,18 +396,7 @@ class ReviewRequest(object): self.srpmfile, self.username + "@" + self.settings.upload_target, ] - self.log.debug(cmd) - try: - proc = Popen( - cmd, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - universal_newlines=True, - ) - output = proc.communicate()[0] - except OSError as err: - print("OSError : %s" % str(err)) - return (output, proc.returncode) + return self.run_command(cmd) def setup_parser():