diff --git a/yum-HEAD.patch b/yum-HEAD.patch index ffdcb7d..b5e1543 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -643,6 +643,18 @@ index 7a083f7..68dd3c2 100644 - + mkdir -p $(DESTDIR)/etc/bash_completion.d + install -m 644 yum.bash $(DESTDIR)/etc/bash_completion.d +diff --git a/etc/version-groups.conf b/etc/version-groups.conf +index 57d97dd..6e10998 100644 +--- a/etc/version-groups.conf ++++ b/etc/version-groups.conf +@@ -6,6 +6,7 @@ + # even though that's require by rpm(-libs). + run_with_packages = true + pkglist = glibc, sqlite, libcurl, nss, ++ yum-metadata-parser, + rpm, rpm-libs, rpm-python, + python, + python-iniparse, python-urlgrabber, python-pycurl diff --git a/etc/yum.bash b/etc/yum.bash new file mode 100644 index 0000000..5dfdb64 @@ -54414,7 +54426,7 @@ index 3edfe57..0b05812 100644 # if a testcase if failing depsolver.doLoggingSetup(9,9) diff --git a/utils.py b/utils.py -index a053720..dc5b122 100644 +index a053720..dbbbe13 100644 --- a/utils.py +++ b/utils.py @@ -25,7 +25,7 @@ from yum import logginglevels @@ -54533,17 +54545,20 @@ index a053720..dc5b122 100644 time.sleep(2) else: break -@@ -117,6 +203,9 @@ class YumUtilBase(YumBaseCli): +@@ -117,6 +203,12 @@ class YumUtilBase(YumBaseCli): # Now parse the command line for real and # apply some of the options to self.conf (opts, self.cmds) = self._parser.setupYumConfig() -+ self.basecmd = self.cmds[0] # our base command ++ if self.cmds: ++ self.basecmd = self.cmds[0] # our base command ++ else: ++ self.basecmd = None + self.extcmds = self.cmds[1:] # out extended arguments/commands + return opts def doUtilYumSetup(self): -@@ -124,6 +213,7 @@ class YumUtilBase(YumBaseCli): +@@ -124,6 +216,7 @@ class YumUtilBase(YumBaseCli): really just a shorthand for testing""" # FIXME - we need another way to do this, I think. try: diff --git a/yum.spec b/yum.spec index 07f3e0e..5a9f26d 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.25 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -110,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Fri Jan 22 2010 Seth Vidal - 3.2.25-12 +- someone forgot to push their changes + + * Fri Jan 22 2010 Seth Vidal - 3.2.25-11 - more fixes, more fun