diff options
| author |   Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2011-12-06 12:13:59 +0100 |
|---|---|---|
| committer | Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2011-12-06 12:13:59 +0100 |
| commit | 2dacce21a7418c147ab830e3f8e99ad682e3a51b (patch) | |
| tree | fcecf5d21a9d1378b0ffd996718355984ee44d1b | |
| parent | Add an --exclude option instead of hardcoding ruby exclusion. (diff) | |
| download | arch-tools-2dacce21a7418c147ab830e3f8e99ad682e3a51b.tar.gz arch-tools-2dacce21a7418c147ab830e3f8e99ad682e3a51b.tar.bz2 arch-tools-2dacce21a7418c147ab830e3f8e99ad682e3a51b.zip | |
When repoman manifest fails, do not crash entire script.
| -rwxr-xr-x | bugzilla-viewer.py | 7 |
1 files 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") |