Remove commented code that is not needed anymore. Yay!
This commit is contained in:
parent
c7e5e94eac
commit
2221c0fb66
@ -90,9 +90,6 @@ class Gather(pypungi.PungiBase):
|
|||||||
else:
|
else:
|
||||||
arches = yum.rpmUtils.arch.getArchList(config.get('default', 'arch'))
|
arches = yum.rpmUtils.arch.getArchList(config.get('default', 'arch'))
|
||||||
self.ayum.compatarch = config.get('default', 'arch')
|
self.ayum.compatarch = config.get('default', 'arch')
|
||||||
#self.doSackSetup(arches)
|
|
||||||
#self.doSackSetup(archlist=arches) # work around temp break in yum api
|
|
||||||
#self.doSackFilelistPopulate()
|
|
||||||
arches.append('src') # throw source in there, filter it later
|
arches.append('src') # throw source in there, filter it later
|
||||||
self.ayum._getSacks(archlist=arches)
|
self.ayum._getSacks(archlist=arches)
|
||||||
|
|
||||||
@ -353,30 +350,9 @@ class Gather(pypungi.PungiBase):
|
|||||||
|
|
||||||
srpmpolist = []
|
srpmpolist = []
|
||||||
|
|
||||||
## Work around for yum bug
|
|
||||||
#for sack in self.pkgSack.sacks.values():
|
|
||||||
# sack.added = {}
|
|
||||||
# sack.excludes = {}
|
|
||||||
|
|
||||||
#self.pkgSack.excludes = {}
|
|
||||||
|
|
||||||
## We need to reset the yum object
|
|
||||||
#self.pkgSack = None
|
|
||||||
|
|
||||||
## Setup the sack with just src arch
|
|
||||||
#self.doSackSetup(archlist=['src'])
|
|
||||||
|
|
||||||
# Make a new yum object
|
|
||||||
#syum = yum.YumBase()
|
|
||||||
#syum.doConfigSetup(fn=self.config.get('default', 'yumconf'), debuglevel=6, errorlevel=6, root=os.path.join(self.workdir, 'yumroot'))
|
|
||||||
#syum.doRepoSetup()
|
|
||||||
|
|
||||||
#syum._getSacks(archlist=['src'])
|
|
||||||
|
|
||||||
for srpm in self.srpmlist:
|
for srpm in self.srpmlist:
|
||||||
(sname, sver, srel) = srpm.rsplit('-', 2)
|
(sname, sver, srel) = srpm.rsplit('-', 2)
|
||||||
try:
|
try:
|
||||||
#srpmpo = syum.pkgSack.searchNevra(name=sname, ver=sver, rel=srel)[0]
|
|
||||||
srpmpo = self.ayum.pkgSack.searchNevra(name=sname, ver=sver, rel=srel, arch='src')[0]
|
srpmpo = self.ayum.pkgSack.searchNevra(name=sname, ver=sver, rel=srel, arch='src')[0]
|
||||||
if not srpmpo in srpmpolist:
|
if not srpmpo in srpmpolist:
|
||||||
srpmpolist.append(srpmpo)
|
srpmpolist.append(srpmpo)
|
||||||
@ -392,7 +368,6 @@ class Gather(pypungi.PungiBase):
|
|||||||
os.makedirs(pkgdir)
|
os.makedirs(pkgdir)
|
||||||
|
|
||||||
for pkg in srpmpolist:
|
for pkg in srpmpolist:
|
||||||
#repo = syum.repos.getRepo(pkg.repoid)
|
|
||||||
repo = self.ayum.repos.getRepo(pkg.repoid)
|
repo = self.ayum.repos.getRepo(pkg.repoid)
|
||||||
remote = pkg.relativepath
|
remote = pkg.relativepath
|
||||||
local = os.path.basename(remote)
|
local = os.path.basename(remote)
|
||||||
|
Loading…
Reference in New Issue
Block a user