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

Merge pull request #1069 from adrianschroeter/fix_rpm_caching

Browse Source 
fix product build rpm caching
This commit is contained in:
Daniel Mach 2022-07-07 13:32:09 +02:00 committed by GitHub
commit 115f6fb071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/build.py
View File

@ -293,7 +293,7 @@ class Pac:
def makeurls(self, cachedir, urllist):
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.repoarch)
self.fullfilename = os.path.join(self.localdir, self.canonname)
self.urllist = [url % self.mp for url in urllist]

4
osc/fetch.py
View File

@ -265,8 +265,8 @@ class Fetcher:
if not hdrmd5 or hdrmd5 != i.hdrmd5:
print('%s/%s: attempting download from api, since the hdrmd5 did not match - %s != %s'
% (i.project, i.name, hdrmd5, i.hdrmd5))
os.unlink(i.fullfilename)
self.__add_cpio(i)
os.unlink(i.fullfilename)
self.__add_cpio(i)
except KeyboardInterrupt:
print('Cancelled by user (ctrl-c)')