mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-14 01:26:23 +01:00
Code

improve error message if file is not a valid rpm

Browse Source 
The current error message is quite confusing and nobody knows what
"invalid lead magic" means.
This commit is contained in:
lethliel 2018-10-04 15:17:28 +02:00
parent 0be37ef29d
commit 9ffe9b9288
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/util/rpmquery.py
View File

@ -114,7 +114,7 @@ class RpmQuery(packagequery.PackageQuery, packagequery.PackageQueryResult):
data = self.__file.read(self.LEAD_SIZE) data = self.__file.read(self.LEAD_SIZE)
leadmgc, = struct.unpack('!I', data[:4]) leadmgc, = struct.unpack('!I', data[:4])
if leadmgc != self.LEAD_MAGIC: if leadmgc != self.LEAD_MAGIC:
raise RpmError(self.__path, 'invalid lead magic \'%s\'' % leadmgc) raise RpmError(self.__path, 'not a rpm (invalid lead magic \'%s\')' % leadmgc)
sigtype, = struct.unpack('!h', data[78:80]) sigtype, = struct.unpack('!h', data[78:80])
if sigtype != self.HEADERSIG_TYPE: if sigtype != self.HEADERSIG_TYPE:
raise RpmError(self.__path, 'invalid header signature \'%s\'' % sigtype) raise RpmError(self.__path, 'invalid header signature \'%s\'' % sigtype)