rpms/yum-utils/devel yum-utils-HEAD.patch, 1.4, 1.5 yum-utils.spec, 1.80, 1.81

James Antill james at fedoraproject.org
Sun Apr 18 06:09:44 UTC 2010


Author: james

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

Modified Files:
	yum-utils-HEAD.patch yum-utils.spec 
Log Message:
* Sat Apr 17 2010 James Antill <james at fedoraproject.org> - 1.1.26-7
- Fix the changelog entry time comparison in repodiff, again.


yum-utils-HEAD.patch:
 b/debuginfo-install.py                                                   |    6 
 b/docs/Makefile                                                          |    2 
 b/docs/repodiff.1                                                        |    2 
 b/docs/repoquery.1                                                       |   10 
 b/docs/yumdb.8                                                           |  126 ++++++++++
 b/package-cleanup.py                                                     |    3 
 b/plugins/changelog/changelog.py                                         |    4 
 b/plugins/fastestmirror/fastestmirror-asyncore/fastestmirror-asyncore.py |    2 
 b/plugins/fastestmirror/fastestmirror.conf                               |    4 
 b/plugins/fastestmirror/fastestmirror.py                                 |    3 
 b/plugins/fedorakmod/fedorakmod.py                                       |    9 
 b/plugins/fs-snapshot/fs-snapshot.py                                     |    2 
 b/plugins/post-transaction-actions/post-transaction-actions.py           |    2 
 b/plugins/priorities/priorities.py                                       |   10 
 b/plugins/protectbase/protectbase.py                                     |    2 
 b/plugins/remove-with-leaves/remove-with-leaves.py                       |    2 
 b/plugins/upgrade-helper/upgrade-helper.py                               |    8 
 b/repo-graph.py                                                          |    4 
 b/repo-rss.py                                                            |    2 
 b/repoclosure.py                                                         |    8 
 b/repodiff.py                                                            |    2 
 b/repomanage.py                                                          |    4 
 b/repoquery.py                                                           |    6 
 b/reposync.py                                                            |    2 
 b/repotrack.py                                                           |    5 
 b/yum-complete-transaction.py                                            |    2 
 b/yum-debug-dump.py                                                      |    3 
 b/yum-utils.bash                                                         |    3 
 b/yum-utils.spec                                                         |    1 
 b/yumdb.py                                                               |   15 +
 package-cleanup.py                                                       |    2 
 plugins/fastestmirror/fastestmirror.py                                   |    7 
 repoclosure.py                                                           |   35 +-
 repodiff.py                                                              |  119 +++++----
 repoquery.py                                                             |   35 +-
 reposync.py                                                              |   46 +--
 yum-utils.bash                                                           |   45 ++-
 37 files changed, 380 insertions(+), 163 deletions(-)

Index: yum-utils-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils-HEAD.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- yum-utils-HEAD.patch	18 Apr 2010 05:46:13 -0000	1.4
+++ yum-utils-HEAD.patch	18 Apr 2010 06:09:42 -0000	1.5
@@ -1658,24 +1658,22 @@ index 2810108..bc2cbf7 100755
                  for (t, author, content) in  pkg.changelog:
                      if t < oldtime:
                          break
-commit 3d9cf740ee9c9c2fbf8e408fe0eb2d46c1a88a00
+commit d4722ce74fe655888fa9d5b02090a56f6e137ce0
 Author: James Antill <james at and.org>
-Date:   Sun Apr 18 01:44:24 2010 -0400
+Date:   Sun Apr 18 02:08:39 2010 -0400
 
-    One more fix for the changelog time comparison
+    Fix the actual bug in repodiff, comparison
 
 diff --git a/repodiff.py b/repodiff.py
-index bc2cbf7..805e3b0 100755
+index bc2cbf7..7ef7c50 100755
 --- a/repodiff.py
 +++ b/repodiff.py
-@@ -225,8 +225,8 @@ def main(args):
+@@ -220,7 +220,7 @@ def main(args):
+                 #  Don't sort as that can screw the order up when time is the
+                 # same.
+                 oldtime    = oldlogs[0][0]
+-                oldauth    = oldlogs[0][2]
++                oldauth    = oldlogs[0][1]
+                 oldcontent = oldlogs[0][2]
                  for (t, author, content) in  pkg.changelog:
                      if t < oldtime:
-                         break
--                    if ((t == oldtime) and (author == oldauth) and
--                        (content == oldcontent)):
-+                    if ((t == oldtime) and ((author != oldauth) or
-+                                            (content != oldcontent)):
-                         break
-                     tm = datetime.date.fromtimestamp(int(t))
-                     tm = tm.strftime("%a %b %d %Y")


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- yum-utils.spec	18 Apr 2010 05:46:14 -0000	1.80
+++ yum-utils.spec	18 Apr 2010 06:09:42 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.26
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
@@ -623,7 +623,7 @@ fi
 %{_mandir}/man5/yum-fs-snapshot.conf.5.*
 
 %changelog
-* Sat Apr 17 2010 James Antill <james at fedoraproject.org> - 1.1.26-6
+* Sat Apr 17 2010 James Antill <james at fedoraproject.org> - 1.1.26-7
 - Fix the changelog entry time comparison in repodiff, again.
 
 * Fri Apr 16 2010 James Antill <james at fedoraproject.org> - 1.1.26-4



More information about the scm-commits mailing list