[yum-git] 4 commits - plugins/changelog plugins/versionlock yum-utils.spec

[James Antill]

 plugins/changelog/changelog.py       |   14 +++++++++-----
 plugins/versionlock/versionlock.conf |    2 +-
 plugins/versionlock/versionlock.py   |    2 +-
 yum-utils.spec                       |    2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 6032848e707f401b85e65a9a4e3860482634d362
Author: James Antill <james at and.org>
Date:   Wed Feb 20 00:51:07 2008 -0500

    Auto enable versionlock on install, as all other plugins do

diff --git a/plugins/versionlock/versionlock.conf b/plugins/versionlock/versionlock.conf
index 9aae7c9..461b114 100644
--- a/plugins/versionlock/versionlock.conf
+++ b/plugins/versionlock/versionlock.conf
@@ -1,3 +1,3 @@
 [main]
-enabled = 0
+enabled = 1
 locklist = /etc/yum/pluginconf.d/versionlock.list
commit 2cd3ae080486ce46e166c3d5a8ebc6b5b19dd6e2
Author: James Antill <james at and.org>
Date:   Wed Feb 20 00:50:23 2008 -0500

    Fix versionlock plugin

diff --git a/plugins/versionlock/versionlock.py b/plugins/versionlock/versionlock.py
index 940d9e9..4e6da63 100644
--- a/plugins/versionlock/versionlock.py
+++ b/plugins/versionlock/versionlock.py
@@ -49,7 +49,7 @@ def exclude_hook(conduit):
         locked[n] = (e, v, r) 
     for pkg in pkgs:
         if locked.has_key(pkg.name):
-            (n,a,e,v,r) = pkg._pkgtup()
+            (n,a,e,v,r) = pkg.pkgtup
             if compareEVR(locked[pkg.name], (e, v, r)) != 0:
                 conduit.delPackage(pkg)
                 conduit.info(5, 'Excluding package %s due to version lock' % pkg)
commit f4eefa9053ae5b13dbd5fd6bb7f555fc1e11004d
Author: James Antill <james at and.org>
Date:   Tue Feb 19 10:19:20 2008 -0500

    Fix typo

diff --git a/yum-utils.spec b/yum-utils.spec
index 96a7a62..10aefd0 100644
--- a/yum-utils.spec
+++ b/yum-utils.spec
@@ -418,7 +418,7 @@ fi
 
 
 %changelog
-* Fri Fed  1 2008 James Antill <james at fedoraproject.org>
+* Fri Feb  1 2008 James Antill <james at fedoraproject.org>
 - Add filter-data plugin
 
 * Wed Jan 30 2008 Tim Lauridsen <timlau at fedoraproject.org>
commit dc83e028f8051396f24bc232e0b268657ab05244
Author: James Antill <james at and.org>
Date:   Tue Feb 19 10:18:15 2008 -0500

    Output the normal list headers

diff --git a/plugins/changelog/changelog.py b/plugins/changelog/changelog.py
index e5e3299..3a9057b 100644
--- a/plugins/changelog/changelog.py
+++ b/plugins/changelog/changelog.py
@@ -85,16 +85,17 @@ Display changelog data, since a specified time, on a group of packages"""
         pass
 
     def show_data(self, msg, pkgs, name):
+        done = False
         for pkg in pkgs:
             self._pkgs += 1
-            if pkg.sourcerpm in self._done:
+            if pkg.sourcerpm in self._done_spkgs:
                 continue
 
             self._spkgs += 1
 
             for line in changelog_delta(pkg, self._since):
-                if pkg.sourcerpm not in self._done:
-                    if not self._done:
+                if pkg.sourcerpm not in self._done_spkgs:                    
+                    if not self._done_spkgs:
                         msg('')
                         if not self._since:
                             msg('Listing all changelogs')
@@ -102,8 +103,11 @@ Display changelog data, since a specified time, on a group of packages"""
                             msg('Listing changelogs since: ' +
                                 str(self._since_dto.date()))
                     msg('')
+                    if not done:
+                        msg("%s %s %s" % ('=' * 20, name, '=' * 20))
+                    done = True
 
-                    self._done[pkg.sourcerpm] = True
+                    self._done_spkgs[pkg.sourcerpm] = True
                     msg('%-40.40s %s' % (pkg, pkg.repoid))
                 self._changelogs += 1
                 msg(line)
@@ -116,7 +120,7 @@ Display changelog data, since a specified time, on a group of packages"""
         def msg_warn(x):
             logger.warn(x)
 
-        self._done = {}
+        self._done_spkgs = {}
         self._pkgs = 0
         self._spkgs = 0
         self._changelogs = 0