rpms/yum/devel latest-head4rawhide.sh, 1.1, 1.2 yum-HEAD.patch, 1.59, 1.60 yum-manpage-files.patch, 1.3, 1.4 yum.spec, 1.320, 1.321

James Antill james at fedoraproject.org
Wed Jun 16 04:54:52 UTC 2010


Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1589

Modified Files:
	latest-head4rawhide.sh yum-HEAD.patch yum-manpage-files.patch 
	yum.spec 
Log Message:
* Tue Jun 15 2010 James Antill <james at fedoraproject.org> - 3.2.27-16
- Latest head.
- Fix install being recorded as reinstall.
- Make localinstall not install obsoleted only by installed.
- Fix info -v, on available packages.
- Fix man page stuff.
- Deal with unicide on rpmdb problems.
- Allow ipkg.repo.name to work.
- Add ville's epoch None vs. 0 code, in compareEVR.



Index: latest-head4rawhide.sh
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/latest-head4rawhide.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- latest-head4rawhide.sh	11 Jun 2010 19:50:20 -0000	1.1
+++ latest-head4rawhide.sh	16 Jun 2010 04:54:49 -0000	1.2
@@ -1,4 +1,4 @@
-#! /bin/zsh -e
+#! /bin/bash -e
 
 done=false
 if [ "x$1" = "xjames" ]; then

yum-HEAD.patch:
 Makefile                       |    2 
 b/Makefile                     |    2 
 b/cli.py                       |   63 
 b/docs/yum.8                   |   10 
 b/docs/yum.conf.5              |    5 
 b/etc/Makefile                 |    1 
 b/etc/yum.bash                 |    7 
 b/output.py                    |   39 
 b/po/cs.po                     | 1406 ++++++++++++---------
 b/po/en_GB.po                  | 2711 ++++++++++++++++++++++++++++++++++++++++-
 b/po/fi.po                     |  204 +--
 b/po/pt_BR.po                  | 1724 +++++++++++++++-----------
 b/po/ru.po                     |   13 
 b/po/sv.po                     | 1423 ++++++++++++---------
 b/po/uk.po                     | 2632 +++++++++++++++++++++++++++++++++++++++
 b/rpmUtils/miscutils.py        |   45 
 b/rpmUtils/oldUtils.py         |    2 
 b/rpmUtils/transaction.py      |    7 
 b/rpmUtils/updates.py          |   13 
 b/test/depsolvetests.py        |   16 
 b/test/packagetests.py         |    2 
 b/test/simpleobsoletestests.py |   19 
 b/test/simpleupdatetests.py    |   41 
 b/test/testbase.py             |    2 
 b/test/yum-leak-test.py        |   55 
 b/test/yum-pylintrc            |    3 
 b/utils.py                     |    3 
 b/yum-updatesd.py              |    8 
 b/yum.spec                     |    3 
 b/yum/__init__.py              |   11 
 b/yum/comps.py                 |   21 
 b/yum/config.py                |    3 
 b/yum/depsolve.py              |   12 
 b/yum/history.py               |   35 
 b/yum/logginglevels.py         |    3 
 b/yum/mdparser.py              |    2 
 b/yum/metalink.py              |    6 
 b/yum/misc.py                  |    9 
 b/yum/packageSack.py           |   32 
 b/yum/packages.py              |   16 
 b/yum/pgpmsg.py                |    3 
 b/yum/pkgtag_db.py             |    4 
 b/yum/plugins.py               |    3 
 b/yum/repoMDObject.py          |   93 +
 b/yum/repos.py                 |    2 
 b/yum/rpmsack.py               |   17 
 b/yum/sqlitesack.py            |   27 
 b/yum/transactioninfo.py       |   11 
 b/yum/update_md.py             |    5 
 b/yum/yumRepo.py               |    9 
 b/yumcommands.py               |   23 
 b/yummain.py                   |   11 
 cli.py                         |   99 +
 docs/yum.8                     |   48 
 docs/yum.conf.5                |   82 +
 etc/Makefile                   |    1 
 etc/yum.bash                   |   18 
 output.py                      |  298 +++-
 po/fi.po                       |    5 
 po/ru.po                       | 1303 +++++++++----------
 po/sv.po                       |  157 --
 rpmUtils/miscutils.py          |   25 
 rpmUtils/updates.py            |   40 
 test/simpleobsoletestests.py   |    6 
 test/simpleupdatetests.py      |    6 
 test/testbase.py               |   15 
 test/yum-leak-test.py          |   57 
 utils.py                       |   28 
 yum.spec                       |   28 
 yum/__init__.py                |  535 +++++---
 yum/comps.py                   |    6 
 yum/config.py                  |  111 +
 yum/depsolve.py                |  188 ++
 yum/history.py                 |  317 ++++
 yum/logginglevels.py           |   59 
 yum/metalink.py                |    6 
 yum/misc.py                    |  163 +-
 yum/packageSack.py             |   46 
 yum/packages.py                |  167 +-
 yum/pgpmsg.py                  |   17 
 yum/repoMDObject.py            |   11 
 yum/rpmsack.py                 |  278 +++-
 yum/sqlitesack.py              |  162 +-
 yum/transactioninfo.py         |   72 -
 yum/update_md.py               |   26 
 yum/yumRepo.py                 |   52 
 yumcommands.py                 |   19 
 87 files changed, 11506 insertions(+), 3764 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.59 -r 1.60 yum-HEAD.patchIndex: yum-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum-HEAD.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- yum-HEAD.patch	11 Jun 2010 19:50:20 -0000	1.59
+++ yum-HEAD.patch	16 Jun 2010 04:54:49 -0000	1.60
@@ -22898,3 +22898,8910 @@ index b661191..3e95626 100644
 -- 
 1.7.0.1
 
+
+From ccc7580db40c98a2f0eaf52a9e130f83975f215c Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Sun, 13 Jun 2010 17:37:40 -0400
+Subject: [PATCH 185] Only do installed_by and changed_by if we are dealing with installed pkgs.
+
+---
+ output.py |   29 +++++++++++++++--------------
+ 1 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/output.py b/output.py
+index 4a1e10e..72d42fa 100755
+--- a/output.py
++++ b/output.py
+@@ -574,20 +574,21 @@ class YumOutput:
+             print _("Buildtime   : %s") % time.ctime(pkg.buildtime)
+             if hasattr(pkg, 'installtime'):
+                 print _("Install time: %s") % time.ctime(pkg.installtime)
+-            uid = None
+-            if 'installed_by' in pkg.yumdb_info:
+-                try:
+-                    uid = int(pkg.yumdb_info.installed_by)
+-                except ValueError: # In case int() fails
+-                    uid = None
+-            print _("Installed by: %s") % self._pwd_ui_username(uid)
+-            uid = None
+-            if 'changed_by' in pkg.yumdb_info:
+-                try:
+-                    uid = int(pkg.yumdb_info.changed_by)
+-                except ValueError: # In case int() fails
+-                    uid = None
+-            print _("Changed by  : %s") % self._pwd_ui_username(uid)
++            if pkg.repoid == 'installed':
++                uid = None
++                if 'installed_by' in pkg.yumdb_info:
++                    try:
++                        uid = int(pkg.yumdb_info.installed_by)
++                    except ValueError: # In case int() fails
++                        uid = None
++                print _("Installed by: %s") % self._pwd_ui_username(uid)
++                uid = None
++                if 'changed_by' in pkg.yumdb_info:
++                    try:
++                        uid = int(pkg.yumdb_info.changed_by)
++                    except ValueError: # In case int() fails
++                        uid = None
++                print _("Changed by  : %s") % self._pwd_ui_username(uid)
+         print self.fmtKeyValFill(_("Summary     : "), self._enc(pkg.summary))
+         if pkg.url:
+             print _("URL         : %s") % to_unicode(pkg.url)
+-- 
+1.7.0.1
+
+
+From ae9c555ef993ed717c7dcc58da8ae64cd01348ff Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Mon, 14 Jun 2010 01:09:10 -0400
+Subject: [PATCH 186] Fix the tsflags documentation
+
+---
+ docs/yum.conf.5 |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
+index 37ab23e..ee7ea4f 100644
+--- a/docs/yum.conf.5
++++ b/docs/yum.conf.5
+@@ -214,7 +214,9 @@ diskspace before a RPM transaction is run. Default is `1' (perform the check).
+ .IP
+ \fBtsflags\fR
+ Comma or space separated list of transaction flags to pass to the rpm
+-transaction set. These include 'noscripts', 'notriggers', 'nodocs', 'test', and 'repackage'.
++transaction set. These include 'noscripts', 'notriggers', 'nodocs', 'test',
++'justdb' and 'nocontexts'. 'repackage' is also available but that does nothing
++with newer rpm versions.
+ You can set all/any of them. However, if you don't know what these do in the
+ context of an rpm transaction set you're best leaving it alone. Default is
+ an empty list.
+-- 
+1.7.0.1
+
+
+From 6f0569459dfcbbc6cda233564b76c6cb0fad23eb Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Mon, 14 Jun 2010 01:17:10 -0400
+Subject: [PATCH 187] Add protected.d and vars to the yum.conf man page FILES section
+
+---
+ docs/yum.conf.5 |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
+index ee7ea4f..ca36103 100644
+--- a/docs/yum.conf.5
++++ b/docs/yum.conf.5
+@@ -815,6 +815,8 @@ data in any value.
+ /etc/yum/yum.conf
+ /etc/yum/repos.d/
+ /etc/yum/pluginconf.d/
++/etc/yum/protected.d
++/etc/yum/vars
+ 
+ .SH "SEE ALSO"
+ .LP 
+-- 
+1.7.0.1
+
+
+From 20a55b240dc40cabe7f6e6edfbb18f7e2396119a Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Mon, 14 Jun 2010 11:49:41 -0400
+Subject: [PATCH 188] Add name to FakeRepo
+
+---
+ yum/packages.py |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/yum/packages.py b/yum/packages.py
+index 98d4d38..14015fd 100644
+--- a/yum/packages.py
++++ b/yum/packages.py
+@@ -198,6 +198,7 @@ class FakeRepository:
+ 
+     def __init__(self, repoid):
+         self._set_cleanup_repoid(repoid)
++        self.name = self.id
+         self.sack = FakeSack()
+ 
+     def __cmp__(self, other):
+-- 
+1.7.0.1
+
+
+From 757ef1509f22d654361a6855cd2c5ece3c733379 Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Mon, 14 Jun 2010 11:50:07 -0400
+Subject: [PATCH 189] Deal with putting non-en rpmdb problems in the history DB
+
+---
+ yum/history.py |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/yum/history.py b/yum/history.py
+index bfb0b45..a676773 100644
+--- a/yum/history.py
++++ b/yum/history.py
+@@ -414,7 +414,8 @@ class YumHistory:
+                          """INSERT INTO trans_rpmdb_problems
+                          (tid, problem, msg)
+                          VALUES (?, ?, ?)""", (self._tid,
+-                                               problem.problem, str(problem)))
++                                               problem.problem,
++                                               to_unicode(str(problem))))
+         rpid = cur.lastrowid
+ 
+         if not rpid:
+-- 
+1.7.0.1
+
+
+From 21394e52934e6f95fe5ddabe3a0ee781e9bf9e5f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Sat, 5 Jun 2010 20:15:38 +0300
+Subject: [PATCH 190] Fix 0 vs None Epoch handling in compareEVR().
+
+Previously, None Epochs got stringified to literal 'None' strings which
+do not compare equal with '0'.  Now they're explicitly made '0's.  Previous
+behavior with '' Epochs is unchanged.
+---
+ rpmUtils/miscutils.py |   10 ++++++++--
+ test/packagetests.py  |    1 +
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/rpmUtils/miscutils.py b/rpmUtils/miscutils.py
+index b1631ae..cdb1cb6 100644
+--- a/rpmUtils/miscutils.py
++++ b/rpmUtils/miscutils.py
+@@ -37,10 +37,16 @@ def compareEVR((e1, v1, r1), (e2, v2, r2)):
+     # return 1: a is newer than b
+     # 0: a and b are the same version
+     # -1: b is newer than a
+-    e1 = str(e1)
++    if e1 is None:
++        e1 = '0'
++    else:
++        e1 = str(e1)
+     v1 = str(v1)
+     r1 = str(r1)
[...8519 lines suppressed...]
++#, python-format
++msgid "Loading \"%s\" plugin"
++msgstr "Loading \"%s\" plugin"
++
++#: ../yum/plugins.py:316
++#, python-format
++msgid ""
++"Two or more plugins with the name \"%s\" exist in the plugin search path"
++msgstr "Two or more plugins with the name \"%s\" exist in the plugin search path"
++
++#: ../yum/plugins.py:336
++#, python-format
++msgid "Configuration file %s not found"
++msgstr "Configuration file %s not found"
++
++#. for
++#. Configuration files for the plugin not found
++#: ../yum/plugins.py:339
++#, python-format
++msgid "Unable to find configuration file for plugin %s"
++msgstr "Unable to find configuration file for plugin %s"
++
++#: ../yum/plugins.py:501
++msgid "registration of commands not supported"
++msgstr "registration of commands not supported"
++
++#: ../yum/rpmsack.py:102
++msgid "has missing requires of"
++msgstr "has missing requires of"
++
++#: ../yum/rpmsack.py:105
++msgid "has installed conflicts"
++msgstr "has installed conflicts"
++
++#: ../yum/rpmsack.py:114
++#, python-format
++msgid "%s is a duplicate with %s"
++msgstr "%s is a duplicate with %s"
++
++#: ../yum/rpmtrans.py:79
++msgid "Repackaging"
++msgstr "Repackaging"
++
++#: ../rpmUtils/oldUtils.py:33
++#, python-format
++msgid "Header cannot be opened or does not match %s, %s."
++msgstr "Header cannot be opened or does not match %s, %s."
++
++#: ../rpmUtils/oldUtils.py:53
++#, python-format
++msgid "RPM %s fails md5 check"
++msgstr "RPM %s fails md5 check"
++
++#: ../rpmUtils/oldUtils.py:151
++msgid "Could not open RPM database for reading. Perhaps it is already in use?"
++msgstr "Could not open RPM database for reading. Perhaps it is already in use?"
++
++#: ../rpmUtils/oldUtils.py:183
++msgid "Got an empty Header, something has gone wrong"
++msgstr "Got an empty Header, something has gone wrong"
++
++#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
++#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
++#, python-format
++msgid "Damaged Header %s"
++msgstr "Damaged Header %s"
++
++#: ../rpmUtils/oldUtils.py:281
++#, python-format
++msgid "Error opening rpm %s - error %s"
++msgstr "Error opening rpm %s - error %s"
+-- 
+1.7.0.1
+
+
+From 91b735bce6aeb1f0fbcc051cbca70ee65a983f63 Mon Sep 17 00:00:00 2001
+From: Seth Vidal <skvidal at fedoraproject.org>
+Date: Tue, 15 Jun 2010 13:33:07 -0400
+Subject: [PATCH 194] when doing a localinstall check to see if the pkg we want to install is obsoleted by something already installed
+ not just those things in the repos.
+
+---
+ yum/__init__.py |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/yum/__init__.py b/yum/__init__.py
+index 1d7637f..2db03ae 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -3698,6 +3698,11 @@ class YumBase(depsolve.Depsolve):
+             self.logger.critical(_('Cannot add package %s to transaction. Not a compatible architecture: %s'), pkg, po.arch)
+             return tx_return
+         
++        obsoleters = po.obsoletedBy(self.rpmdb.searchObsoletes(po.name))
++        if obsoleters:
++            self.logger.critical(_('Cannot install package %s. It is obsoleted by installed package %s'), po, obsoleters[0])
++            return tx_return
++            
+         # everything installed that matches the name
+         installedByKey = self.rpmdb.searchNevra(name=po.name)
+         # go through each package
+-- 
+1.7.0.1
+
+
+From 0e5e89c155be58ad5163f48dbf4bf05d3cc30336 Mon Sep 17 00:00:00 2001
+From: Seth Vidal <skvidal at fedoraproject.org>
+Date: Tue, 15 Jun 2010 13:48:03 -0400
+Subject: [PATCH 195] add 'if self.conf.obsoletes' to the installed-pkg obsoletes check for localinstall
+
+---
+ yum/__init__.py |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/yum/__init__.py b/yum/__init__.py
+index 2db03ae..5bc97be 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -3698,10 +3698,11 @@ class YumBase(depsolve.Depsolve):
+             self.logger.critical(_('Cannot add package %s to transaction. Not a compatible architecture: %s'), pkg, po.arch)
+             return tx_return
+         
+-        obsoleters = po.obsoletedBy(self.rpmdb.searchObsoletes(po.name))
+-        if obsoleters:
+-            self.logger.critical(_('Cannot install package %s. It is obsoleted by installed package %s'), po, obsoleters[0])
+-            return tx_return
++        if self.conf.obsoletes:
++            obsoleters = po.obsoletedBy(self.rpmdb.searchObsoletes(po.name))
++            if obsoleters:
++                self.logger.critical(_('Cannot install package %s. It is obsoleted by installed package %s'), po, obsoleters[0])
++                return tx_return
+             
+         # everything installed that matches the name
+         installedByKey = self.rpmdb.searchNevra(name=po.name)
+-- 
+1.7.0.1
+
+
+From 9a6c9f8abc1977b934bd0051013ed7a39bc18af8 Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Mon, 14 Jun 2010 12:09:14 -0400
+Subject: [PATCH 196] Parse out the new private attribute for urls
+
+---
+ yum/metalink.py |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/yum/metalink.py b/yum/metalink.py
+index 20f0ea5..aaa4f25 100755
+--- a/yum/metalink.py
++++ b/yum/metalink.py
+@@ -134,6 +134,8 @@ class MetaLinkURL:
+         self.preference = int(elem.get("preference", -1))
+         self.protocol   = elem.get("type") # This is the "std" attribute name
+         self.location   = elem.get("location")
++        self.private    = elem.get("{%s}private" % __XML_NS_MM__, "false")
++        self.private    = self.private.lower() == "true"
+ 
+         if self.protocol is None: # Try for the old MM protocol attribute
+             self.protocol   = elem.get("protocol")
+@@ -145,8 +147,9 @@ Preference:      %d
+ Max-Connections: %d
+ Protocol:        %s
+ Location:        %s
++Private:         %s
+ """ % (self.url, self.preference, self.max_connections,
+-       self.protocol, self.location)
++       self.protocol, self.location, self.private)
+ 
+     def __cmp__(self, other):
+         if other is None:
+-- 
+1.7.0.1
+
+
+From 10b718b3a09904789de8139dec4f1cd36a43e449 Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Tue, 15 Jun 2010 19:27:00 -0400
+Subject: [PATCH 197] Fix history recording installs, from the txmbr cleanup
+
+---
+ yum/history.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/yum/history.py b/yum/history.py
+index a676773..ca87335 100644
+--- a/yum/history.py
++++ b/yum/history.py
+@@ -343,7 +343,7 @@ class YumHistory:
+     def txmbr2state(txmbr):
+         state = None
+         if txmbr.output_state in (TS_INSTALL, TS_TRUEINSTALL):
+-            if hasattr(txmbr, 'reinstall'):
++            if txmbr.reinstall:
+                 state = 'Reinstall'
+             elif txmbr.downgrades:
+                 state = 'Downgrade'
+-- 
+1.7.0.1
+

yum-manpage-files.patch:
 yum.8      |    6 +++---
 yum.conf.5 |   16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

Index: yum-manpage-files.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum-manpage-files.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- yum-manpage-files.patch	21 Jan 2009 18:42:12 -0000	1.3
+++ yum-manpage-files.patch	16 Jun 2010 04:54:51 -0000	1.4
@@ -1,20 +1,38 @@
-diff -urN olddocs/yum.8 docs/yum.8
---- olddocs/yum.8	2008-03-17 12:09:29.000000000 -0400
-+++ docs/yum.8	2008-03-17 12:08:18.000000000 -0400
-@@ -339,8 +339,8 @@
+commit 102915d4d402493c48d434ae1d1756225c4468e0
+Author: James Antill <james at and.org>
+Date:   Mon Jun 14 01:15:21 2010 -0400
+
+    Port manpage files path fixups.
+
+diff --git a/docs/yum.8 b/docs/yum.8
+index d5ede0a..3bdb408 100644
+--- a/docs/yum.8
++++ b/docs/yum.8
+@@ -568,7 +568,7 @@ option in yum.conf. For a plugin to work, the following conditions must be met:
+ 1. The plugin module file must be installed in the plugin path as just
+ described.
+ .LP
+-2. The global \fBplugins\fP option in /etc/yum/yum.conf must be set to `1'.
++2. The global \fBplugins\fP option in /etc/yum.conf must be set to `1'.
+ .LP
+ 3. A configuration file for the plugin must exist in
+ /etc/yum/pluginconf.d/<plugin_name>.conf and the \fBenabled\fR setting in this
+@@ -584,9 +584,9 @@ configuration options.
  .PP
  .SH "FILES"
  .nf
 -/etc/yum/yum.conf
--/etc/yum/repos.d/
 +/etc/yum.conf
+ /etc/yum/version-groups.conf
+-/etc/yum/repos.d/
 +/etc/yum.repos.d/
  /etc/yum/pluginconf.d/
  /var/cache/yum/
  .fi 
-
---- olddocs/yum.conf.5.orig	2009-01-21 13:33:04.000000000 -0500
-+++ docs/yum.conf.5	2009-01-21 13:34:47.000000000 -0500
+diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
+index ca36103..42815b9 100644
+--- a/docs/yum.conf.5
++++ b/docs/yum.conf.5
 @@ -4,10 +4,10 @@
  \fByum.conf\fR \- Configuration file for \fByum(8)\fR.
  .SH "DESCRIPTION"
@@ -28,9 +46,9 @@ diff -urN olddocs/yum.8 docs/yum.8
  See the \fBreposdir\fR option below for further details.
  
  .SH "PARAMETERS"
-@@ -38,10 +38,10 @@
- 
- .IP \fBreposdir\fR
+@@ -42,10 +42,10 @@ of headers and packages after successful installation.  Default is '1'
+ .IP
+ \fBreposdir\fR
  A list of directories where yum should look for .repo files which define
 -repositories to use. Default is `/etc/yum/repos.d'. Each
 +repositories to use. Default is `/etc/yum.repos.d'. Each
@@ -40,8 +58,8 @@ diff -urN olddocs/yum.8 docs/yum.8
 +repositories defined in /etc/yum.conf to form the complete set of
  repositories that yum will use.
  
- .IP \fBdebuglevel\fR
-@@ -511,8 +511,8 @@
+ .IP
+@@ -745,8 +745,8 @@ for any given command. Defaults to False.
  
  .SH "URL INCLUDE SYNTAX"
  .LP
@@ -52,7 +70,7 @@ diff -urN olddocs/yum.8 docs/yum.8
  line of the following format:
  
  include=url://to/some/location
-@@ -549,8 +549,8 @@
+@@ -812,8 +812,8 @@ data in any value.
  
  .SH "FILES"
  .nf
@@ -61,5 +79,5 @@ diff -urN olddocs/yum.8 docs/yum.8
 +/etc/yum.conf
 +/etc/yum.repos.d/
  /etc/yum/pluginconf.d/
- 
- .SH "SEE ALSO"
+ /etc/yum/protected.d
+ /etc/yum/vars


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- yum.spec	11 Jun 2010 19:50:22 -0000	1.320
+++ yum.spec	16 Jun 2010 04:54:51 -0000	1.321
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.27
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -65,7 +65,7 @@ can notify you when they are available v
 %prep
 %setup -q
 %patch1 -p0
-#%%%patch2 -p0
+%patch2 -p1
 %patch3 -p0
 %patch4 -p0
 %patch5 -p1
@@ -132,6 +132,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Tue Jun 15 2010 James Antill <james at fedoraproject.org> - 3.2.27-16
+- Latest head.
+- Fix install being recorded as reinstall.
+- Make localinstall not install obsoleted only by installed.
+- Fix info -v, on available packages.
+- Fix man page stuff.
+- Deal with unicide on rpmdb problems.
+- Allow ipkg.repo.name to work.
+- Add ville's epoch None vs. 0 code, in compareEVR.
+
 * Fri Jun 11 2010 James Antill <james at fedoraproject.org> - 3.2.27-15
 - Latest head.
 - Add filtering requires code for createrepo.



More information about the scm-commits mailing list