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

Do arch stuff better

Browse Source 
Fix an endless loop
clean up some debug output
This commit is contained in:
jkeating@localhost.localdomain 2006-10-15 23:59:41 -04:00 committed by Jesse Keating
parent bf4931150e
commit 01ab4f42dd
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gather/gather.py
View File

@ -22,16 +22,8 @@ class Gather(yum.YumBase):
yum.YumBase.__init__(self) yum.YumBase.__init__(self)
self.doConfigSetup(fn=opts.yumconf) self.doConfigSetup(fn=opts.yumconf)
self.doRepoSetup() self.doRepoSetup()
# setup archlist arches = yum.rpmUtils.arch.getArchList(opts.arch)
self.archlist = [] self.doSackSetup(arches)
if opts.arch == 'i386':
self.archlist = ['athlon', 'i686', 'i586', 'i486', 'i386', 'noarch']
if opts.arch == 'x86_64':
self.archlist = ['x86_64', 'athlon', 'i686', 'i586', 'i486', 'i386', 'noarch']
if opts.arch == 'ppc':
self.archlist = ['ppc64', 'ppc', 'noarch']
print self.archlist #debug
self.doSackSetup(archlist=self.archlist)
self.logger = yum.logging.getLogger("yum.verbose.fist") self.logger = yum.logging.getLogger("yum.verbose.fist")
self.opts = opts self.opts = opts
self.pkglist = pkglist self.pkglist = pkglist
@ -80,18 +72,18 @@ class Gather(yum.YumBase):
if len(unprocessed_pkgs) == 0: if len(unprocessed_pkgs) == 0:
raise yum.Errors.MiscError, 'No packages found to download.' raise yum.Errors.MiscError, 'No packages found to download.'
while len(unprocessed_pkgs) > 0: # Our fun loop while len(unprocessed_pkgs) > 0: # Our fun loop
for pkg in unprocessed_pkgs: for pkg in unprocessed_pkgs:
if not pkg in unprocessed_pkgs and not pkg in final_pkgobjs: if not pkg in final_pkgobjs:
final_pkgobjs.append(pkg) # Add the pkg to our final list final_pkgobjs.append(pkg) # Add the pkg to our final list
deplist = self.findDeps(pkg) # Get the deps of our package deplist = self.findDeps(pkg) # Get the deps of our package
unprocessed_pkgs.remove(pkg) # Clear the package out of our todo list.
for dep in deplist: # Cycle through deps, if we don't already have it, add it. for dep in deplist: # Cycle through deps, if we don't already have it, add it.
if not dep in unprocessed_pkgs and not dep in final_pkgobjs: if not dep in unprocessed_pkgs and not dep in final_pkgobjs:
unprocessed_pkgs.append(dep) unprocessed_pkgs.append(dep)
unprocessed_pkgs.remove(pkg) # Clear the package out of our todo list.
self.polist = final_pkgobjs self.polist = final_pkgobjs
def downloadPackages(self): def downloadPackages(self):
@ -102,7 +94,7 @@ class Gather(yum.YumBase):
if not self.opts.quiet: if not self.opts.quiet:
downloads = [] downloads = []
for pkg in self.polist: for pkg in self.polist:
downloads.append(pkg.name + pkg.arch) downloads.append('%s.%s' % (pkg.name, pkg.arch))
self.logger.info("Download list: %s" % downloads) self.logger.info("Download list: %s" % downloads)
pkgdir = os.path.join(self.opts.destdir, 'tree') # Package location within destdir, name subject to change/config pkgdir = os.path.join(self.opts.destdir, 'tree') # Package location within destdir, name subject to change/config
@ -136,13 +128,12 @@ def main():
(opts, args) = get_arguments() (opts, args) = get_arguments()
pkglist = get_packagelist(opts.comps) pkglist = get_packagelist(opts.comps)
print pkglist
if not os.path.exists(opts.destdir): if not os.path.exists(opts.destdir):
try: try:
os.makedirs(opts.destdir) os.makedirs(opts.destdir)
except OSError, e: except OSError, e:
print >> sys.stderr, "Error: Cannot destination cache dir %s" % opts.destdir print >> sys.stderr, "Error: Cannot destination dir %s" % opts.destdir
sys.exit(1) sys.exit(1)
if not os.path.exists(opts.cachedir): if not os.path.exists(opts.cachedir):