particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid baseurl option in createrepo

Browse source
This commit is contained in:
Mike McLean 2012-06-28 17:29:58 -04:00
parent 957fff5ff5
commit da6dd0b183
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
builder/kojid
View file

@ -2710,7 +2710,7 @@ class CreaterepoTask(BaseTaskHandler):
def create_local_repo(self, rinfo, arch, pkglist, groupdata, oldrepo):
koji.ensuredir(self.outdir)
cmd = ['/usr/bin/createrepo', '-vd', '-o', self.outdir, '-u', self.options.topurl]
cmd = ['/usr/bin/createrepo', '-vd', '-o', self.outdir]
if pkglist is not None:
cmd.extend(['-i', pkglist])
if os.path.isfile(groupdata):
@ -2737,7 +2737,7 @@ class CreaterepoTask(BaseTaskHandler):
if pkglist is None:
cmd.append(self.outdir)
else:
cmd.append(self.options.topdir)
cmd.append(self.repodir)
logfile = '%s/createrepo.log' % self.workdir
status = log_output(self.session, cmd[0], cmd, logfile, self.getUploadDir(), logerror=True)

6
hub/kojihub.py
View file

@ -2187,7 +2187,7 @@ def repo_init(tag, with_src=False, with_debuginfo=False, event=None):
packages = {}
for repoarch in repo_arches:
packages.setdefault(repoarch, [])
relpathinfo = koji.PathInfo(topdir='')
relpathinfo = koji.PathInfo(topdir='toplink')
for rpminfo in rpms:
if not with_debuginfo and koji.is_debuginfo(rpminfo['name']):
continue
@ -2220,6 +2220,10 @@ def repo_init(tag, with_src=False, with_debuginfo=False, event=None):
# src and noarch special-cased -- see below
archdir = os.path.join(repodir, arch)
koji.ensuredir(archdir)
# Make a symlink to our topdir
top_relpath = koji.util.relpath(koji.pathinfo.topdir, archdir)
top_link = os.path.join(archdir, 'toplink')
os.symlink(top_relpath, top_link)
pkglist = file(os.path.join(repodir, arch, 'pkglist'), 'w')
logger.info("Creating package list for %s" % arch)
for rpminfo in packages[arch]: