From 2dacce21a7418c147ab830e3f8e99ad682e3a51b Mon Sep 17 00:00:00 2001 From: "Pawel Hajdan, Jr" Date: Tue, 6 Dec 2011 12:13:59 +0100 Subject: When repoman manifest fails, do not crash entire script. --- bugzilla-viewer.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bugzilla-viewer.py b/bugzilla-viewer.py index 45584a5..ce0b2eb 100755 --- a/bugzilla-viewer.py +++ b/bugzilla-viewer.py @@ -353,9 +353,10 @@ if __name__ == "__main__": manifest_contents = open(manifest_path).read() try: output = repoman_dict[bug.id_number()] - output += subprocess.Popen(["ekeyword", options.arch, ebuild_name], cwd=cvs_path, stdout=subprocess.PIPE).communicate()[0] - subprocess.check_call(["repoman", "manifest"], cwd=cvs_path) - output += subprocess.Popen(["repoman", "full"], cwd=cvs_path, stdout=subprocess.PIPE).communicate()[0] + output += subprocess.Popen(["ekeyword", options.arch, ebuild_name], cwd=cvs_path, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0] + # repoman manifest may fail if files are unfetchable. It shouldn't abort this script. + output += subprocess.Popen(["repoman", "manifest"], cwd=cvs_path, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0] + output += subprocess.Popen(["repoman", "full"], cwd=cvs_path, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0] repoman_dict[bug.id_number()] = output finally: f = open(ebuild_path, "w") -- cgit v1.2.3-65-gdbad