Blame SOURCES/BZ-1083182-traceback-on-nonexisting-pkglist.patch
|
 |
345e10 |
commit a45146a2e7bd623c72823edbeef1f22753625d78
|
|
|
345e10 |
Author: Zdenek Pavlas <zpavlas@redhat.com>
|
|
|
345e10 |
Date: Thu Dec 19 15:48:52 2013 +0100
|
|
|
345e10 |
|
|
|
345e10 |
catch IOErrors when loading pkglist. BZ 1044997
|
|
|
345e10 |
|
|
|
345e10 |
diff --git a/genpkgmetadata.py b/genpkgmetadata.py
|
|
|
345e10 |
index 946f6b6..35e7fc9 100755
|
|
|
345e10 |
--- a/genpkgmetadata.py
|
|
|
345e10 |
+++ b/genpkgmetadata.py
|
|
|
345e10 |
@@ -199,14 +199,15 @@ def parse_args(args, conf):
|
|
|
345e10 |
|
|
|
345e10 |
lst = []
|
|
|
345e10 |
if conf.pkglist:
|
|
|
345e10 |
- pfo = open(conf.pkglist, 'r')
|
|
|
345e10 |
- for line in pfo.readlines():
|
|
|
345e10 |
- line = line.strip()
|
|
|
345e10 |
- if re.match('^\s*\#.*', line) or re.match('^\s*$', line):
|
|
|
345e10 |
- continue
|
|
|
345e10 |
- lst.append(line)
|
|
|
345e10 |
- pfo.close()
|
|
|
345e10 |
-
|
|
|
345e10 |
+ try:
|
|
|
345e10 |
+ for line in open(conf.pkglist):
|
|
|
345e10 |
+ line = line.strip()
|
|
|
345e10 |
+ if re.match('^\s*\#.*', line) or re.match('^\s*$', line):
|
|
|
345e10 |
+ continue
|
|
|
345e10 |
+ lst.append(line)
|
|
|
345e10 |
+ except EnvironmentError, e:
|
|
|
345e10 |
+ print >> sys.stderr, e
|
|
|
345e10 |
+ sys.exit(1)
|
|
|
345e10 |
conf.pkglist = lst
|
|
|
345e10 |
|
|
|
345e10 |
if conf.includepkg:
|