mirror of
https://github.com/openSUSE/osc.git
synced 2024-12-25 17:36:13 +01:00
- fixed fullfilename calculation in the Pac class
Now, the fullfilename is calculated using the canonname of a bdep instead of using the bdep's binary attribute (the canonname and binary attribute can differ (e.g. ConsoleKit-64bit-0.4.6-3.2.ppc.rpm vs. ::import::ppc64::ConsoleKit-64bit-0.4.6-3.2.ppc.rpm))
This commit is contained in:
parent
10aa2203bb
commit
84ba8c6e17
12
osc/build.py
12
osc/build.py
@ -211,13 +211,15 @@ class Pac:
|
||||
self.mp['apiurl'] = apiurl
|
||||
|
||||
if pacsuffix == 'deb':
|
||||
filename = debquery.DebQuery.filename(self.mp['name'], self.mp['epoch'], self.mp['version'], self.mp['release'], self.mp['arch'])
|
||||
canonname = debquery.DebQuery.filename(self.mp['name'], self.mp['epoch'], self.mp['version'], self.mp['release'], self.mp['arch'])
|
||||
elif pacsuffix == 'arch':
|
||||
filename = archquery.ArchQuery.filename(self.mp['name'], self.mp['epoch'], self.mp['version'], self.mp['release'], self.mp['arch'])
|
||||
canonname = archquery.ArchQuery.filename(self.mp['name'], self.mp['epoch'], self.mp['version'], self.mp['release'], self.mp['arch'])
|
||||
else:
|
||||
filename = rpmquery.RpmQuery.filename(self.mp['name'], self.mp['epoch'], self.mp['version'], self.mp['release'], self.mp['arch'])
|
||||
canonname = rpmquery.RpmQuery.filename(self.mp['name'], self.mp['epoch'], self.mp['version'], self.mp['release'], self.mp['arch'])
|
||||
|
||||
self.mp['filename'] = node.get('binary') or filename
|
||||
self.mp['canonname'] = canonname
|
||||
# maybe we should rename filename key to binary
|
||||
self.mp['filename'] = node.get('binary') or canonname
|
||||
if self.mp['repopackage'] == '_repository':
|
||||
self.mp['repofilename'] = self.mp['name']
|
||||
else:
|
||||
@ -238,7 +240,7 @@ class Pac:
|
||||
# or if-modified-since, so the caching is simply name-based (on the assumption
|
||||
# that the filename is suitable as identifier)
|
||||
self.localdir = '%s/%s/%s/%s' % (cachedir, self.project, self.repository, self.arch)
|
||||
self.fullfilename = os.path.join(self.localdir, self.filename)
|
||||
self.fullfilename = os.path.join(self.localdir, self.canonname)
|
||||
self.url_local = 'file://%s' % self.fullfilename
|
||||
|
||||
# first, add the local URL
|
||||
|
@ -217,7 +217,7 @@ class Fetcher:
|
||||
|
||||
fullfilename = os.path.join(destdir, canonname)
|
||||
if pac_obj is not None:
|
||||
pac_obj.filename = canonname
|
||||
pac_obj.canonname = canonname
|
||||
pac_obj.fullfilename = fullfilename
|
||||
shutil.move(tmpfile, fullfilename)
|
||||
os.chmod(fullfilename, 0o644)
|
||||
|
Loading…
Reference in New Issue
Block a user