Hello community, here is the log from the commit of package yum checked in at Mon May 21 15:12:05 CEST 2007. -------- --- yum/yum.changes 2007-05-03 13:50:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/yum/yum.changes 2007-05-21 13:24:04.749027000 +0200 @@ -1,0 +2,7 @@ +Mon May 21 13:22:10 CEST 2007 - cthiel@suse.de + +- update to version 3.2.0 + * latests stable release +- drop yum-install.patch, included in 3.2.0 + +------------------------------------------------------------------- Old: ---- yum-3.1.7.tar.bz2 yum-install.patch New: ---- yum-3.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.C27303/_old 2007-05-21 15:12:00.000000000 +0200 +++ /var/tmp/diff_new_pack.C27303/_new 2007-05-21 15:12:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yum (Version 3.1.7) +# spec file for package yum (Version 3.2.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: yum BuildRequires: python-devel -Version: 3.1.7 +Version: 3.2.0 Release: 1 Summary: RPM installer/updater Group: System/Packages @@ -22,7 +22,6 @@ Source1: %{name}.conf Source2: repos.tar.bz2 Patch: %{name}-no_updatesd.patch -Patch1: %{name}-install.patch Patch2: %{name}-3.1.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: rpm >= 4.4.0 @@ -51,7 +50,6 @@ %prep %setup -q -b 2 %patch -%patch1 %patch2 %ifnarch %{ix86} for i in rpmUtils yum @@ -99,6 +97,10 @@ %{py_sitedir}/* %changelog +* Mon May 21 2007 - cthiel@suse.de +- update to version 3.2.0 + * latests stable release +- drop yum-install.patch, included in 3.2.0 * Thu May 03 2007 - cthiel@suse.de - added yum-3.1.7.patch to workaround bug #255914 * Thu May 03 2007 - cthiel@suse.de ++++++ yum-3.1.7.tar.bz2 -> yum-3.2.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/bin/yum-updatesd.py new/yum-3.2.0/bin/yum-updatesd.py --- old/yum-3.1.7/bin/yum-updatesd.py 2006-12-05 09:33:35.000000000 +0100 +++ new/yum-3.2.0/bin/yum-updatesd.py 2007-05-15 14:18:07.000000000 +0200 @@ -1,32 +1,25 @@ #!/usr/bin/python -import sys -try: - import yum -except ImportError: - print >> sys.stderr, """\ -There was a problem importing one of the Python modules -required to run yum. The error leading to this problem was: - - %s +import sys, os +import optparse -Please install a package which provides this module, or -verify that the module is installed correctly. +parser = optparse.OptionParser() +parser.add_option("-f", "--no-fork", action="store_true", default=False, dest="nofork") +parser.add_option("-r", "--remote-shutdown", action="store_true", default=False, dest="remoteshutdown") +(options, args) = parser.parse_args() -It's possible that the above module doesn't match the -current version of Python, which is: -%s - -If you cannot solve this problem yourself, please go to -the yum faq at: - http://wiki.linux.duke.edu/YumFaq - -""" % (sys.exc_value, sys.version) - sys.exit(1) +if not options.nofork: + if os.fork(): + sys.exit() + fd = os.open("/dev/null", os.O_RDWR) + os.dup2(fd, 0) + os.dup2(fd, 1) + os.dup2(fd, 2) + os.close(fd) sys.path.insert(0, '/usr/share/yum-cli') try: import yumupd - yumupd.main() + yumupd.main(options) except KeyboardInterrupt, e: print >> sys.stderr, "\n\nExiting on user cancel." sys.exit(1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/ChangeLog new/yum-3.2.0/ChangeLog --- old/yum-3.1.7/ChangeLog 2007-04-27 15:40:35.000000000 +0200 +++ new/yum-3.2.0/ChangeLog 2007-05-16 23:03:32.000000000 +0200 @@ -1,3 +1,57 @@ +2007-05-16 17:02 skvidal + + * yum.spec, yum/__init__.py: mark as 3.2.0 + +2007-05-16 09:21 skvidal + + * yum/Makefile, rpmUtils/Makefile: fix from Christoph Thiel and Jan + Matejek "The problem is that when precompiling python files, the + compiler needs to know their "base path" which will be used in + debug outputs (such as the backtrace). Without this patch, makefile + sets $(PYDIR) as the base path, but $(PYDIR) isn't defined and the + base path stays empty. (some of our python builds apparently can't + deal with it and use PIL's base path instead) The patch replaces + $(PYDIR) with correct value, $(PKGDIR)." + +2007-05-14 14:39 katzj + + * yum/__init__.py: don't cause repos to be set up unnecessarily + (rh#238940) + +2007-05-06 00:12 lmacken + + * yum/update_md.py: - Add title and release to metadata - Clean up + UpdateNotice.__str__ - Remove pushcount, as it does not seem very + useful at the moment - inline DTD updates - s/summary/title/ for + Bugzilla and CVE's + +2007-05-02 21:24 katzj + + * yum-updatesd.py, bin/yum-updatesd.py: move option parsing around + a little so that yum-updatesd will start faster (rh#220614) + +2007-05-02 19:19 jbowes + + * cli.py, shell.py, yumcommands.py, docs/yum.8: Add repolist + command. + + This is just the 'repo list' yum shell command. 'repo list' now + calls the repolist command instead. + +2007-05-02 17:58 katzj + + * yum-updatesd.py: fix name error (#238685) + +2007-04-29 09:51 skvidal + + * yum/yumRepo.py: + make sure we can set and del repoobj.urls for fastestmirrors, etc + rh bugs: 238305 and 238276 + +2007-04-27 09:37 skvidal + + * ChangeLog: changelog merge - 3.1.7 + 2007-04-27 09:29 skvidal * yum.spec: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/cli.py new/yum-3.2.0/cli.py --- old/yum-3.1.7/cli.py 2007-04-27 15:16:12.000000000 +0200 +++ new/yum-3.2.0/cli.py 2007-05-15 14:18:07.000000000 +0200 @@ -80,6 +80,7 @@ self.registerCommand(yumcommands.ResolveDepCommand()) self.registerCommand(yumcommands.ShellCommand()) self.registerCommand(yumcommands.DepListCommand()) + self.registerCommand(yumcommands.RepoListCommand()) def registerCommand(self, command): for name in command.getNames(): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/docs/yum.8 new/yum-3.2.0/docs/yum.8 --- old/yum-3.1.7/docs/yum.8 2007-04-27 15:16:12.000000000 +0200 +++ new/yum-3.2.0/docs/yum.8 2007-05-15 14:18:08.000000000 +0200 @@ -50,9 +50,10 @@ .br .I \fR * localupdate rpmfile1 [rpmfile2] [\&.\&.\&.] .br -.br .I \fR * deplist package1 [package2] [\&.\&.\&.] .br +.I \fR * repolist [all|enabled|disabled] +.br .PP Unless the \-\-help or \-h option is given, one of the above commands must be present\&. @@ -140,6 +141,10 @@ Produces a list of all dependencies and what packages provide those dependencies for the given packages. .IP +.IP "\fBrepolist\fP" +Produces a list of configured repositories. The default is to list all +enabled repositories. +.IP .PP .SH "GENERAL OPTIONS" Most command line options can be set using the configuration file as diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/rpmUtils/Makefile new/yum-3.2.0/rpmUtils/Makefile --- old/yum-3.1.7/rpmUtils/Makefile 2005-02-25 08:49:38.000000000 +0100 +++ new/yum-3.2.0/rpmUtils/Makefile 2007-05-16 15:15:09.000000000 +0200 @@ -17,4 +17,4 @@ for p in $(PYFILES) ; do \ install -m 644 $$p $(DESTDIR)/$(PKGDIR)/$$p; \ done - $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PYDIR)', 1)" + $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PKGDIR)', 1)" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/shell.py new/yum-3.2.0/shell.py --- old/yum-3.1.7/shell.py 2007-03-16 21:27:51.000000000 +0100 +++ new/yum-3.2.0/shell.py 2007-05-15 14:18:07.000000000 +0200 @@ -241,20 +241,20 @@ def do_repo(self, line): (cmd, args, line) = self.parseline(line) if cmd in ['list', None]: - format_string = "%-20.20s %-40.40s %s" - if self.base.repos.repos.values(): - self.verbose_logger.log(logginglevels.INFO_2, format_string, - 'repo id', 'repo name', 'status') - repos = self.base.repos.repos.values() - repos.sort() - for repo in repos: - if repo in self.base.repos.listEnabled() and args in ('', 'enabled'): - self.verbose_logger.log(logginglevels.INFO_2, format_string, - repo, repo.name, 'enabled') - elif args in ('', 'disabled'): - self.verbose_logger.log(logginglevels.INFO_2, format_string, - repo, repo.name, 'disabled') - + # Munge things to run the repolist command + cmds = self._shlex_split(args) + if not cmds: + cmds = ['all'] + cmds.insert(0, 'repolist') + self.base.cmds = cmds + + try: + self.base.parseCommands() + except Errors.YumBaseError: + pass + else: + self.base.doCommands() + elif cmd == 'enable': repos = self._shlex_split(args) for repo in repos: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum/__init__.py new/yum-3.2.0/yum/__init__.py --- old/yum-3.1.7/yum/__init__.py 2007-04-26 15:33:52.000000000 +0200 +++ new/yum-3.2.0/yum/__init__.py 2007-05-16 22:57:12.000000000 +0200 @@ -53,7 +53,7 @@ from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage from constants import * -__version__ = '3.1.7' +__version__ = '3.2.0' class YumBase(depsolve.Depsolve): """This is a primary structure and base class. It houses the objects and @@ -439,8 +439,9 @@ if val is None: # if we unset the comps object, we need to undo which repos have # been added to the group file as well - for repo in self.repos.listGroupsEnabled(): - repo.groups_added = False + if self._repos: + for repo in self._repos.listGroupsEnabled(): + repo.groups_added = False self._comps = val def _getGroups(self): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum/Makefile new/yum-3.2.0/yum/Makefile --- old/yum-3.1.7/yum/Makefile 2005-02-25 08:49:38.000000000 +0100 +++ new/yum-3.2.0/yum/Makefile 2007-05-16 15:15:22.000000000 +0200 @@ -17,4 +17,4 @@ for p in $(PYFILES) ; do \ install -m 644 $$p $(DESTDIR)/$(PKGDIR)/$$p; \ done - $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PYDIR)', 1)" + $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PKGDIR)', 1)" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum/update_md.py new/yum-3.2.0/yum/update_md.py --- old/yum-3.1.7/yum/update_md.py 2007-04-25 20:55:36.000000000 +0200 +++ new/yum-3.2.0/yum/update_md.py 2007-05-15 14:18:08.000000000 +0200 @@ -21,6 +21,7 @@ import gzip import exceptions +from textwrap import wrap from yum.yumRepo import YumRepository try: @@ -39,6 +40,8 @@ self._md = { 'from' : '', 'type' : '', + 'title' : '', + 'release' : '', 'status' : '', 'version' : '', 'pushcount' : '', @@ -60,36 +63,47 @@ def __str__(self): head = """ -ID : %(update_id)s -Type : %(type)s -Status : %(status)s -Issued : %(issued)s -Updated : %(updated)s -Description : -%(description)s - """ % self._md - - refs = '\n== References ==\n' - for ref in self._md['references']: - type = ref['type'] - if type == 'cve': - refs += '\n%s : %s\n%s\n' % (ref['id'], ref['href'], - ref.has_key('summary') and - ref['summary'] or '') - elif type == 'bugzilla': - refs += '\nBug #%s : %s\n%s\n' % (ref['id'], ref['href'], - ref.has_key('summary') and - ref['summary'] or '') +=============================================================================== + %(title)s +=============================================================================== + Update ID : %(update_id)s + Release : %(release)s + Type : %(type)s + Status : %(status)s + Issued : %(issued)s +""" % self._md + + if self._md['updated'] and self._md['updated'] != self._md['issued']: + head += " Updated : %(updated)s" % self_md + + # Add our bugzilla references + bzs = filter(lambda r: r['type'] == 'bugzilla', self._md['references']) + if len(bzs): + buglist = " Bugs :" + for bz in bzs: + buglist += " %s%s\n\t :" % (bz['id'], bz.has_key('title') + and ' - %s' % bz['title'] or '') + head += buglist[:-1].rstrip() + '\n' + + # Add our CVE references + cves = filter(lambda r: r['type'] == 'cve', self._md['references']) + if len(cves): + cvelist = " CVEs :" + for cve in cves: + cvelist += " %s\n\t :" % cve['id'] + head += cvelist[:-1].rstrip() + '\n' + + desc = wrap(self._md['description'], width=64, + subsequent_indent=' ' * 12 + ': ') + head += "Description : %s\n" % '\n'.join(desc) - pkglist = '\n== Updated Packages ==\n' + filelist = " Files :" for pkg in self._md['pkglist']: - pkglist += '\n%s\n' % pkg['name'] for file in pkg['packages']: - pkglist += ' %s %s\n' % (file['sum'][1], file['filename']) + filelist += " %s\n\t :" % file['filename'] + head += filelist[:-1].rstrip() - msg = head + refs + pkglist - - return msg + return head def get_metadata(self): """ Return the metadata dict. """ @@ -98,7 +112,7 @@ def _parse(self, elem): """ Parse an update element. - <!ELEMENT update (id, pushcount, synopsis?, issued, updated, + <!ELEMENT update (id, synopsis?, issued, updated, references, description, pkglist)> <!ATTLIST update type (errata|security) "errata"> <!ATTLIST update status (final|testing) "final"> @@ -125,6 +139,10 @@ self._md['description'] = child.text elif child.tag == 'pkglist': self._parse_pkglist(child) + elif child.tag == 'title': + self._md['title'] = child.text + elif child.tag == 'release': + self._md['release'] = child.text else: raise UpdateNoticeException('No update element found') @@ -132,23 +150,17 @@ """ Parse the update references. <!ELEMENT references (reference*)> - <!ELEMENT reference (summary*)> + <!ELEMENT reference> <!ATTLIST reference href CDATA #REQUIRED> <!ATTLIST reference type (self|cve|bugzilla) "self"> <!ATTLIST reference id CDATA #IMPLIED> - <!ELEMENT cve (#PCDATA)> - <!ELEMENT bugzilla (#PCDATA)> - <!ELEMENT summary (#PCDATA)> - <!ELEMENT description (#PCDATA)> + <!ATTLIST reference title CDATA #IMPLIED> """ for reference in elem: if reference.tag == 'reference': data = {} - for refattrib in ('id', 'href', 'type'): + for refattrib in ('id', 'href', 'type', 'title'): data[refattrib] = reference.attrib.get(refattrib) - for child in reference: - if child.tag == 'summary': - data['summary'] = child.text self._md['references'].append(data) else: raise UpdateNoticeException('No reference element found') diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum/yumRepo.py new/yum-3.2.0/yum/yumRepo.py --- old/yum-3.1.7/yum/yumRepo.py 2007-04-26 00:25:52.000000000 +0200 +++ new/yum-3.2.0/yum/yumRepo.py 2007-04-29 15:52:43.000000000 +0200 @@ -35,6 +35,9 @@ import logging import logginglevels +import warnings +warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning) + logger = logging.getLogger("yum.Repos") verbose_logger = logging.getLogger("yum.verbose.Repos") @@ -468,7 +471,10 @@ self._baseurlSetup() return self._urls - urls = property(lambda self: self._geturls()) + urls = property(fget=lambda self: self._geturls(), + fset=lambda self, value: setattr(self, "_urls", value), + fdel=lambda self: setattr(self, "_urls", None)) + def _getFile(self, url=None, relative=None, local=None, start=None, end=None, copy_local=0, checkfunc=None, text=None, reget='simple', cache=True): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yumcommands.py new/yum-3.2.0/yumcommands.py --- old/yum-3.1.7/yumcommands.py 2007-01-22 05:31:30.000000000 +0100 +++ new/yum-3.2.0/yumcommands.py 2007-05-15 14:18:07.000000000 +0200 @@ -414,3 +414,40 @@ return 1, [str(e)] +class RepoListCommand: + usage = 'repolist [all|enabled|disabled]' + + def getNames(self): + return ('repolist',) + + def getUsage(self): + return usage + + def doCheck(self, base, basecmd, extcmds): + if len(extcmds) == 0: + return + elif len(extcmds) > 1 or extcmds[0] not in ('all', 'disabled', + 'enabled'): + raise cli.CliError + + def doCommand(self, base, basecmd, extcmds): + if len(extcmds) == 1: + arg = extcmds[0] + else: + arg = 'enabled' + + format_string = "%-20.20s %-40.40s %s" + if base.repos.repos.values(): + base.verbose_logger.log(logginglevels.INFO_2, format_string, + 'repo id', 'repo name', 'status') + repos = base.repos.repos.values() + repos.sort() + for repo in repos: + if repo in base.repos.listEnabled() and arg in ('all', 'enabled'): + base.verbose_logger.log(logginglevels.INFO_2, format_string, + repo, repo.name, 'enabled') + elif arg in ('all', 'disabled'): + base.verbose_logger.log(logginglevels.INFO_2, format_string, + repo, repo.name, 'disabled') + + return 0, [] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum.spec new/yum-3.2.0/yum.spec --- old/yum-3.1.7/yum.spec 2007-04-27 15:32:09.000000000 +0200 +++ new/yum-3.2.0/yum.spec 2007-05-16 22:57:49.000000000 +0200 @@ -1,6 +1,6 @@ Summary: RPM installer/updater Name: yum -Version: 3.1.7 +Version: 3.2.0 Release: 1 License: GPL Group: System Environment/Base @@ -91,6 +91,9 @@ %{_mandir}/man*/yum-updatesd* %changelog +* Wed May 16 2007 Seth Vidal <skvidal at fedoraproject.org> +- 3.2.0 + * Thu Apr 26 2007 Seth Vidal <skvidal at linux.duke.edu> - 3.1.7 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum-updatesd.py new/yum-3.2.0/yum-updatesd.py --- old/yum-3.1.7/yum-updatesd.py 2007-04-26 00:19:28.000000000 +0200 +++ new/yum-3.2.0/yum-updatesd.py 2007-05-15 14:18:07.000000000 +0200 @@ -479,11 +479,11 @@ self.populateUpdates() if self.opts.do_update: - uit = UpdateInstallThread(self, dlpkgs) + uit = UpdateInstallThread(self) uit.start() elif self.opts.do_download: self.emitDownloading() - dl = UpdateDownloadThread(self, dlpkgs) + dl = UpdateDownloadThread(self) dl.start() else: # just notify about things being available @@ -602,25 +602,25 @@ os.chdir(initial_directory) os.execve(sys.argv[0], sys.argv, os.environ) -def main(): +def main(options = None): # we'll be threading for downloads/updates gobject.threads_init() dbus.glib.threads_init() - - parser = OptionParser() - parser.add_option("-f", "--no-fork", action="store_true", default=False, dest="nofork") - parser.add_option("-r", "--remote-shutdown", action="store_true", default=False, dest="remoteshutdown") - (options, args) = parser.parse_args() - - if not options.nofork: - if os.fork(): - sys.exit() - fd = os.open("/dev/null", os.O_RDWR) - os.dup2(fd, 0) - os.dup2(fd, 1) - os.dup2(fd, 2) - os.close(fd) + if options is None: + parser = OptionParser() + parser.add_option("-f", "--no-fork", action="store_true", default=False, dest="nofork") + parser.add_option("-r", "--remote-shutdown", action="store_true", default=False, dest="remoteshutdown") + (options, args) = parser.parse_args() + + if not options.nofork: + if os.fork(): + sys.exit() + fd = os.open("/dev/null", os.O_RDWR) + os.dup2(fd, 0) + os.dup2(fd, 1) + os.dup2(fd, 2) + os.close(fd) confparser = ConfigParser() opts = UDConfig() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org