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

- fixed fullfilename calculation in the Pac class

Browse Source 
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:
Marcus Huewe 2015-06-16 17:37:40 +02:00
parent 10aa2203bb
commit 84ba8c6e17
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osc/build.py
View File

@ -211,13 +211,15 @@ class Pac:
self.mp['apiurl'] = apiurl self.mp['apiurl'] = apiurl
if pacsuffix == 'deb': 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': 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: 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': if self.mp['repopackage'] == '_repository':
self.mp['repofilename'] = self.mp['name'] self.mp['repofilename'] = self.mp['name']
else: else:
@ -238,7 +240,7 @@ class Pac:
# or if-modified-since, so the caching is simply name-based (on the assumption # or if-modified-since, so the caching is simply name-based (on the assumption
# that the filename is suitable as identifier) # that the filename is suitable as identifier)
self.localdir = '%s/%s/%s/%s' % (cachedir, self.project, self.repository, self.arch) 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 self.url_local = 'file://%s' % self.fullfilename
# first, add the local URL # first, add the local URL

2
osc/fetch.py
View File

@ -217,7 +217,7 @@ class Fetcher:
fullfilename = os.path.join(destdir, canonname) fullfilename = os.path.join(destdir, canonname)
if pac_obj is not None: if pac_obj is not None:
pac_obj.filename = canonname pac_obj.canonname = canonname
pac_obj.fullfilename = fullfilename pac_obj.fullfilename = fullfilename
shutil.move(tmpfile, fullfilename) shutil.move(tmpfile, fullfilename)
os.chmod(fullfilename, 0o644) os.chmod(fullfilename, 0o644)