starlingx/root
Code Issues Proposed changes

Merge "downloader: fix downloading binaries twice"

Browse Source
This commit is contained in:
Zuul 2022-05-10 17:56:09 +00:00 committed by Gerrit Code Review
commit d2141026d5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build-tools/stx/downloader
View File

@ -266,13 +266,14 @@ class DebDownloader(BaseDownloader):
sys.exit(1) sys.exit(1)
arch = package.candidate.architecture arch = package.candidate.architecture
pname_arch = '_'.join([pkg_name, pkg_ver, arch]) + '.deb' pname_arch = '_'.join([pkg_name, pkg_ver, arch]) + '.deb'
pname_epoch_arch = '_'.join([pkg_name, pkg_name_array[1], arch]) + '.deb'
self.dl_need.append(pkg_name + '_' + pkg_ver) self.dl_need.append(pkg_name + '_' + pkg_ver)
if self.downloaded and pname_arch in self.downloaded: if self.downloaded and pname_arch in self.downloaded:
logger.debug(''.join([pkg_name, '_', pkg_ver, logger.debug(''.join([pkg_name, '_', pkg_ver,
' has been downloaded, skip'])) ' has been downloaded, skip']))
self.dl_success.append(pkg_name + '_' + pkg_ver) self.dl_success.append(pkg_name + '_' + pkg_ver)
self.need_upload.append([pname_arch, pkg_name_array[1]]) self.need_upload.append([pname_arch, pname_epoch_arch])
else: else:
# Tests show that the 'epoch' should be taken when # Tests show that the 'epoch' should be taken when
# fetch the package with 'apt' module, there is not 'epoch' # fetch the package with 'apt' module, there is not 'epoch'
@ -284,21 +285,19 @@ class DebDownloader(BaseDownloader):
logger.info(' '.join(['previously_uploaded', str(previously_uploaded)])) logger.info(' '.join(['previously_uploaded', str(previously_uploaded)]))
for debs in self.need_upload: for debs in self.need_upload:
deb = debs[0] deb = debs[0]
fver = debs[1] deb_fver = debs[1]
if previously_uploaded and deb in previously_uploaded: # Search the package with the "eopch" in aptly repo
if previously_uploaded and deb_fver in previously_uploaded:
logger.info(' '.join([os.path.join(stx_bin_mirror, deb), logger.info(' '.join([os.path.join(stx_bin_mirror, deb),
'has already been uploaded to', REPO_BIN, ', skip'])) 'has already been uploaded to', REPO_BIN, ', skip']))
continue continue
name, ver, arch = deb.split('_')
if not self.repomgr.search_pkg(REPO_BIN, name, fver, True):
if name and ver:
logger.debug('Package %s-%s not found in %s', name, ver, REPO_BIN)
if self.repomgr.upload_pkg(REPO_BIN, os.path.join(stx_bin_mirror, deb)): if self.repomgr.upload_pkg(REPO_BIN, os.path.join(stx_bin_mirror, deb)):
logger.info(' '.join([os.path.join(stx_bin_mirror, deb), logger.info(' '.join([os.path.join(stx_bin_mirror, deb),
'is uploaded to', REPO_BIN])) 'is uploaded to', REPO_BIN]))
else: else:
logger.info(' '.join([os.path.join(stx_bin_mirror, deb), logger.info(' '.join([os.path.join(stx_bin_mirror, deb),
'fail to uploaded to', REPO_BIN])) 'fail to uploaded to', REPO_BIN]))
self.need_upload.clear()
for deb in self.need_download: for deb in self.need_download:
logger.debug(' '.join(['package', deb, 'needs to be downloaded'])) logger.debug(' '.join(['package', deb, 'needs to be downloaded']))
debnames = deb.split('_') debnames = deb.split('_')
@ -314,6 +313,7 @@ class DebDownloader(BaseDownloader):
logger.error(''.join([debnames[0], '_', debnames[1], ' fail to upload to ', REPO_BIN])) logger.error(''.join([debnames[0], '_', debnames[1], ' fail to upload to ', REPO_BIN]))
else: else:
self.dl_failed.append(deb) self.dl_failed.append(deb)
self.need_download.clear()
def start(self): def start(self):
"""Here define: """Here define: