mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-27 10:16:14 +01:00
Code

do not crash on reading rpms (missuse of filname as file object)

Browse Source
This commit is contained in:
Adrian Schröter 2010-02-05 10:31:26 +01:00
parent c48cc43d1a
commit c18adb7edf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc/util/rpmquery.py
View File

@ -62,7 +62,7 @@ class RpmQuery(packagequery.PackageQuery):
def __init__(self, fh): def __init__(self, fh):
self.__file = fh self.__file = fh
self.__file = os.path.abspath(fh.name) self.__filename = os.path.abspath(fh.name)
self.filename_suffix = 'rpm' self.filename_suffix = 'rpm'
self.header = None self.header = None
@ -224,7 +224,11 @@ class RpmQuery(packagequery.PackageQuery):
def query(filename): def query(filename):
f = open(filename, 'rb') f = open(filename, 'rb')
rpmq = RpmQuery(f) rpmq = RpmQuery(f)
rpmq.read() if rpmq:
rpmq.read()
else:
print "Failed to read", filename, "as rpm"
sys.exit(2)
f.close() f.close()
return rpmq return rpmq