[yum-commits] 3 commits - debuginfo-install.py yum-utils.spec

[skvidal at osuosl.org]

 debuginfo-install.py |    4 +++-
 yum-utils.spec       |    6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e8eab207c74b811b03e9182bff792af84249eb5a
Merge: 0a7c94e... 963f574...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Oct 12 10:23:51 2009 -0400

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum-utils
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum-utils:
      Do obsoletes as well as updates in security list excluding

commit 0a7c94e2bc32b96b16b53c7bff2e13603e92109e
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Oct 12 10:23:04 2009 -0400

    - add compileall command to yum-utils.spec for plugins
    - fixes rh bug https://bugzilla.redhat.com/show_bug.cgi?id=493174

diff --git a/yum-utils.spec b/yum-utils.spec
index 13b5f8c..6de64ee 100644
--- a/yum-utils.spec
+++ b/yum-utils.spec
@@ -9,6 +9,7 @@ URL: http://yum.baseurl.org/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python >= 2.4 , yum >= 3.2.24
+BuildRequires: python >= 2.4
 
 %description
 yum-utils is a collection of utilities and examples for the yum package
@@ -396,6 +397,7 @@ cd plugins
 for plug in $plugins; do
     install -m 644 $plug/*.conf $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/
     install -m 644 $plug/*.py $RPM_BUILD_ROOT/usr/lib/yum-plugins/
+    %{__python} -c "import compileall; compileall.compile_dir('$(RPM_BUILD_ROOT)/usr/lib/yum-plugins', 1")
 done
 install -m 644 aliases/aliases $RPM_BUILD_ROOT/%{_sysconfdir}/yum/aliases.conf
 install -m 644 versionlock/versionlock.list $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/
@@ -596,6 +598,10 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Seth Vidal <skvidal at fedoraproject.org>
+- add python compileall to all plugins so we get .pyc/.pyo files in them
+- fixes https://bugzilla.redhat.com/show_bug.cgi?id=493174
+
 * Wed Sep 2 2009 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.23
 
commit 4837d4008e9abcc53d04fb12933f0db44e1c02db
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Oct 9 17:37:37 2009 -0400

    make sure we're calling the logging output instead of print so -q does something

diff --git a/debuginfo-install.py b/debuginfo-install.py
index b496951..7090d92 100755
--- a/debuginfo-install.py
+++ b/debuginfo-install.py
@@ -22,6 +22,7 @@ import yum
 import yum.Errors
 
 from utils import YumUtilBase
+from yum import _
 
 import logging
 import rpmUtils
@@ -69,7 +70,8 @@ class DebugInfoInstall(YumUtilBase):
         for repo in self.repos.listEnabled():
             di = '%s-debuginfo' % repo.id
             for r in self.repos.findRepos(di):
-                print 'enabling %s' % r.id
+                self.logger.log(yum.logginglevels.INFO_2, 
+                                _('enabling %s') % r.id)
                 r.enable()
                 self.doRepoSetup(thisrepo=r.id)
                 #r.setup(self.conf.cache, self.mediagrabber)