Hello community, here is the log from the commit of package yum checked in at Sun Aug 6 22:22:09 CEST 2006. -------- --- yum/yum.changes 2006-05-26 16:45:07.000000000 +0200 +++ yum/yum.changes 2006-08-05 18:47:44.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Aug 5 18:45:08 CEST 2006 - cthiel@suse.de + +- update to version 2.9.3 + * new dev cycle +- require yum-metadata-parser +- added yum-2.9.3-misc.patch and yum-syslog.patch from Fedora +- updated yum.conf +- don't package yum updatesd for now + +------------------------------------------------------------------- Old: ---- Makefile-etc.patch yum-2.6.1-defaults.patch yum-2.6.1.tar.bz2 New: ---- yum-2.9.3-misc.patch yum-2.9.3-no_updatesd.patch yum-2.9.3.tar.bz2 yum-syslog.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.ILLqzb/_old 2006-08-06 22:22:05.000000000 +0200 +++ /var/tmp/diff_new_pack.ILLqzb/_new 2006-08-06 22:22:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yum (Version 2.6.1) +# spec file for package yum (Version 2.9.3) # # Copyright (c) 2006 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: 2.6.1 +Version: 2.9.3 Release: 1 Summary: RPM installer/updater Group: System/Packages @@ -20,8 +20,9 @@ URL: http://linux.duke.edu/yum/ Source: %{name}-%{version}.tar.bz2 Source1: %{name}.conf -Patch: Makefile-etc.patch -Patch1: yum-%{version}-defaults.patch +Patch: %{name}-%{version}-misc.patch +Patch1: %{name}-syslog.patch +Patch2: %{name}-%{version}-no_updatesd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: rpm >= 4.1.1 Requires: rpm-python @@ -29,6 +30,7 @@ Requires: python-elementtree Requires: python-sqlite Requires: python-urlgrabber +Requires: yum-metadata-parser %py_requires @@ -44,9 +46,10 @@ Seth Vidal <skvidal@phy.duke.edu> %prep -%setup +%setup -q %patch -#%patch1 +%patch1 +%patch2 %ifnarch %{ix86} for i in repomd rpmUtils yum do @@ -80,6 +83,13 @@ %{py_sitedir}/* %changelog -n yum +* Sat Aug 05 2006 - cthiel@suse.de +- update to version 2.9.3 + * new dev cycle +- require yum-metadata-parser +- added yum-2.9.3-misc.patch and yum-syslog.patch from Fedora +- updated yum.conf +- don't package yum updatesd for now * Thu May 25 2006 - cthiel@suse.de - update to version 2.6.1 * includes countless bugfixes ++++++ yum-2.9.3-misc.patch ++++++ --- yum/__init__.py 12 Jul 2006 04:04:56 -0000 1.216 +++ yum/__init__.py 12 Jul 2006 18:30:49 -0000 1.217 @@ -524,6 +524,8 @@ # bogus data in the pid file. Throw away. self._unlock(lockfile) else: + if oldpid == os.getpid(): # if we own the lock, we're fine + return try: os.kill(oldpid, 0) except OSError, e: if e[0] == errno.ESRCH: --- yum/depsolve.py 28 Jun 2006 16:37:50 -0000 1.84 +++ yum/depsolve.py 12 Jul 2006 17:53:56 -0000 1.85 @@ -521,7 +521,7 @@ return self._requiringFromTransaction(reqpkg, requirement, errorlist) else: self.verbose_logger.log(logginglevels.DEBUG_2, 'Unresolveable requirement %s for %s', - niceformatneed, reqpkg_print) + niceformatneed, reqpkg[0]) checkdeps = 0 missingdep = 1 ++++++ yum-2.9.3-no_updatesd.patch ++++++ --- Makefile +++ Makefile @@ -24,9 +24,8 @@ mv $(DESTDIR)/usr/share/yum-cli/yum-updatesd.py $(DESTDIR)/usr/share/yum-cli/yumupd.py $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)" - mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin + mkdir -p $(DESTDIR)/usr/bin install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum - install -m 755 bin/yum-updatesd.py $(DESTDIR)/usr/sbin/yum-updatesd mkdir -p $(DESTDIR)/var/cache/yum --- etc/Makefile +++ etc/Makefile @@ -11,13 +11,3 @@ mkdir -p $(DESTDIR)/etc/logrotate.d install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum - mkdir -p $(DESTDIR)/etc/rc.d/init.d - install -m 755 yum-updatesd.init $(DESTDIR)/etc/rc.d/init.d/yum-updatesd - - mkdir -p $(DESTDIR)/etc/dbus-1/system.d/ - install -m 755 yum-updatesd-dbus.conf $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf - - mkdir -p $(DESTDIR)/etc/yum/ - install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf - - ++++++ yum-2.6.1.tar.bz2 -> yum-2.9.3.tar.bz2 ++++++ ++++ 16500 lines of diff (skipped) ++++++ yum-syslog.patch ++++++ From: skvidal <skvidal> Date: Thu, 20 Jul 2006 18:40:17 +0000 (+0000) Subject: checking in patch to bug 199558 from jbowes. X-Git-Url: http://www.jur-linux.org/git/?p=cvs-yum.git;a=commitdiff;h=a83ce277535d2460c... checking in patch to bug 199558 from jbowes. --- --- yum/logginglevels.py +++ yum/logginglevels.py @@ -106,13 +106,16 @@ def doLoggingSetup(uid, logfile, errorle logger = logging.getLogger("yum") logger.propagate = False logger.addHandler(console_stderr) - - syslog = logging.handlers.SysLogHandler('/dev/log') - syslog.setFormatter(plainformatter) + filelogger = logging.getLogger("yum.filelogging") filelogger.setLevel(logging.INFO) filelogger.propagate = False - filelogger.addHandler(syslog) + + log_dev = '/dev/log' + if os.path.exists(log_dev): + syslog = logging.handlers.SysLogHandler(log_dev) + syslog.setFormatter(plainformatter) + filelogger.addHandler(syslog) # TODO: When python's logging config parser doesn't blow up # when the user is non-root, put this in the config file. ++++++ yum.conf ++++++ --- yum/yum.conf 2006-05-25 17:39:23.000000000 +0200 +++ yum/yum.conf 2006-08-05 18:43:23.000000000 +0200 @@ -12,5 +12,9 @@ plugins=1 metadata_expire=1800 +exactarchlist=kernel-bigsmp, kernel-debug, kernel-default, kernel-dummy, kernel-iseries64, kernel-ppc64, kernel-s390, kernel-smp, kernel-syms, kernel-um, kernel-xen, kernel-xenpae, glibc +installonlypkgs=kernel-bigsmp, kernel-debug, kernel-default, kernel-dummy, kernel-iseries64, kernel-ppc64, kernel-s390, kernel-smp, kernel-syms, kernel-um, kernel-xen, kernel-xenpae +kernelpkgnames=kernel-bigsmp, kernel-debug, kernel-default, kernel-dummy, kernel-iseries64, kernel-ppc64, kernel-s390, kernel-smp, kernel-syms, kernel-um, kernel-xen, kernel-xenpae + # PUT YOUR REPOS HERE OR IN separate files named file.repo # in /etc/yum.repos.d ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...