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

- Don't use 'returnSimple' anymore, deprecated in yum api

Browse Source
This commit is contained in:
jkeating@reducto.boston.redhat.com 2007-02-06 13:54:06 -05:00 committed by Jesse Keating
parent 8a7700a4a1
commit 2c5642e3d7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -1,5 +1,6 @@
* Tue Feb 06 2007 Jesse Keating <jkeating@redhat.com> * Tue Feb 06 2007 Jesse Keating <jkeating@redhat.com>
- yum bestPackagesFromList takes an arch argument. Fixes ppc64 bug - yum bestPackagesFromList takes an arch argument. Fixes ppc64 bug
- Don't use 'returnSimple' anymore, deprecated in yum api
* Sat Feb 03 2007 Jesse Keating <jkeating@redhat.com> * Sat Feb 03 2007 Jesse Keating <jkeating@redhat.com>
- Be able to opt-out of a bugurl since buildinstall supports this - Be able to opt-out of a bugurl since buildinstall supports this

12
pypungi/gather.py
View File

@ -143,7 +143,7 @@ class Gather(yum.YumBase):
for po in self.polist: for po in self.polist:
srpm = po.returnSimple('sourcerpm').split('.src.rpm')[0] srpm = po.sourcerpm.split('.src.rpm')[0]
if not srpm in self.srpmlist: if not srpm in self.srpmlist:
self.srpmlist.append(srpm) self.srpmlist.append(srpm)
@ -172,11 +172,11 @@ class Gather(yum.YumBase):
for pkg in self.polist: for pkg in self.polist:
repo = self.repos.getRepo(pkg.repoid) repo = self.repos.getRepo(pkg.repoid)
remote = pkg.returnSimple('relativepath') remote = pkg.relativepath
local = os.path.basename(remote) local = os.path.basename(remote)
local = os.path.join(self.config.get('default', 'cachedir'), local) local = os.path.join(self.config.get('default', 'cachedir'), local)
if (os.path.exists(local) and if (os.path.exists(local) and
str(os.path.getsize(local)) == pkg.returnSimple('packagesize')): str(os.path.getsize(local)) == pkg.packagesize):
if not self.config.has_option('default', 'quiet'): if not self.config.has_option('default', 'quiet'):
self.logger.info("%s already exists and appears to be complete" % local) self.logger.info("%s already exists and appears to be complete" % local)
@ -235,14 +235,14 @@ class Gather(yum.YumBase):
for pkg in srpmpolist: for pkg in srpmpolist:
repo = self.repos.getRepo(pkg.repoid) repo = self.repos.getRepo(pkg.repoid)
remote = pkg.returnSimple('relativepath') remote = pkg.relativepath
local = os.path.basename(remote) local = os.path.basename(remote)
local = os.path.join(self.config.get('default', 'cachedir'), local) local = os.path.join(self.config.get('default', 'cachedir'), local)
if os.path.exists(local) and str(os.path.getsize(local)) == pkg.returnSimple('packagesize'): if os.path.exists(local) and str(os.path.getsize(local)) == pkg.packagesize:
if not self.config.has_option('default', 'quiet'): if not self.config.has_option('default', 'quiet'):
self.logger.info("%s already exists and appears to be complete" % local) self.logger.info("%s already exists and appears to be complete" % local)
if os.path.exists(os.path.join(pkgdir, os.path.basename(remote))) and str(os.path.getsize(os.path.join(pkgdir, os.path.basename(remote)))) == pkg.returnSimple('packagesize'): if os.path.exists(os.path.join(pkgdir, os.path.basename(remote))) and str(os.path.getsize(os.path.join(pkgdir, os.path.basename(remote)))) == pkg.packagesize:
if not self.config.has_option('default', 'quiet'): if not self.config.has_option('default', 'quiet'):
self.logger.info("%s already exists in tree and appears to be complete" % local) self.logger.info("%s already exists in tree and appears to be complete" % local)
else: else: