Pushed the wrong version of the patch

Revert "Parse repomd.xml to determin the location of the pkgorigins file"

This reverts commit 7461b01213.
This commit is contained in:
Dennis Gilmore 2012-03-06 16:16:52 -06:00
parent 7461b01213
commit cabbbca924

View file

@ -54,7 +54,6 @@ from fnmatch import fnmatch
from gzip import GzipFile
from optparse import OptionParser, SUPPRESS_HELP
from StringIO import StringIO
from yum import repoMDObject
#imports for LiveCD and Appliance handler
image_enabled = False
@ -553,19 +552,8 @@ class BuildRoot(object):
pathinfo = koji.PathInfo(topdir='')
#XXX - cheap hack to get relative paths
repodir = pathinfo.repo(self.repo_info['id'], self.repo_info['tag_name'])
repomdpath = os.path.join(repodir, self.br_arch, 'repodata', 'repomd.xml')
relpath = os.path.join(repodir, self.br_arch, 'repodata', 'pkgorigins.gz')
opts = dict([(k, getattr(self.options, k)) for k in 'topurl','topdir'])
fo = koji.openRemoteFile(repomdpath, **opts)
repodata = repoMDObject.RepoMD('foo')
try:
repodata.parse(fo)
except:
raise koji.BuildError, "Unable to parse repomd.xml file for %s" % os.path.join(repodir, self.br_arch)
data = repodata.getData('origin')
pkgorigins = data.location[1]
relpath = os.path.join(repodir, self.br_arch, pkgorigins)
fo = koji.openRemoteFile(relpath, **opts)
#at this point we know there were external repos at the create event,
#so there should be an origins file.