almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

gather.py: use createrepo_c for creating repodata instead of obsolete createrepo python library 

Fixes: https://pagure.io/pungi/issue/1094
Merges: https://pagure.io/pungi/pull-request/1097
Signed-off-by: Frédéric Pierret (fepitre) <frederic.pierret@qubes-os.org>
This commit is contained in:
Frédéric Pierret (fepitre) 2018-12-30 17:47:24 +01:00 committed by Lubomír Sedlář
parent c69bc13068
commit f41c32e413
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pungi/gather.py
View File

@ -22,7 +22,6 @@ import subprocess
import sys import sys
from fnmatch import fnmatch from fnmatch import fnmatch
import createrepo
import lockfile import lockfile
import urlgrabber.progress import urlgrabber.progress
import yum import yum
@ -32,7 +31,7 @@ import ConfigParser
import arch as arch_module import arch as arch_module
import multilib_yum as multilib import multilib_yum as multilib
import pungi.util import pungi.util
from pungi.wrappers.createrepo import CreaterepoWrapper
class ReentrantYumLock(object): class ReentrantYumLock(object):
""" A lock that can be acquired multiple times by the same process. """ """ A lock that can be acquired multiple times by the same process. """
@ -1406,39 +1405,33 @@ class Pungi(PungiBase):
basedir = os.path.join(self.destdir, self.config.get('pungi', 'version')) basedir = os.path.join(self.destdir, self.config.get('pungi', 'version'))
if subfile.startswith(basedir): if subfile.startswith(basedir):
return subfile.replace(basedir + os.path.sep, '') return subfile.replace(basedir + os.path.sep, '')
def _makeMetadata(self, path, cachedir, comps=False, repoview=False, repoviewtitle=False, def _makeMetadata(self, path, cachedir, comps=False, repoview=False, repoviewtitle=False,
baseurl=False, output=False, basedir=False, update=True, baseurl=False, output=False, basedir=False, update=True,
compress_type=None): compress_type=None):
"""Create repodata and repoview.""" """Create repodata and repoview."""
conf = createrepo.MetaDataConfig() # Define outputdir
conf.cachedir = os.path.join(cachedir, 'createrepocache')
conf.update = update
conf.unique_md_filenames = True
if output: if output:
conf.outputdir = output outputdir = output
else: else:
conf.outputdir = path outputdir = path
conf.directory = path
conf.database = True # Define revision if SOURCE_DATE_EPOCH exists in env
if comps:
conf.groupfile = comps
if basedir:
conf.basedir = basedir
if baseurl:
conf.baseurl = baseurl
if compress_type:
conf.compress_type = compress_type
if 'SOURCE_DATE_EPOCH' in os.environ: if 'SOURCE_DATE_EPOCH' in os.environ:
conf.revision = os.environ['SOURCE_DATE_EPOCH'] revision = os.environ['SOURCE_DATE_EPOCH']
conf.clamp_mtime_to = int(os.environ['SOURCE_DATE_EPOCH']) else:
repomatic = createrepo.MetaDataGenerator(conf) revision = None
createrepo_wrapper = CreaterepoWrapper(createrepo_c=True)
createrepo = createrepo_wrapper.get_createrepo_cmd(directory=path, update=update, outputdir=outputdir,
unique_md_filenames=True, database=True, groupfile=comps,
basedir=basedir, baseurl=baseurl, revision=revision,
compress_type=compress_type)
self.logger.info('Making repodata') self.logger.info('Making repodata')
repomatic.doPkgMetadata() pungi.util._doRunCommand(createrepo, self.logger)
repomatic.doRepoMetadata()
repomatic.doFinalMove()
if repoview: if repoview:
# setup the repoview call # setup the repoview call
repoview = ['/usr/bin/repoview'] repoview = ['/usr/bin/repoview']