[yum-commits] 2 commits - cli.py docs/yum.8 yum-cron/yum-cron.py yum/__init__.py

[zpavlas at osuosl.org]

 cli.py               |   10 +++++-----
 docs/yum.8           |    7 +++++++
 yum-cron/yum-cron.py |    2 ++
 yum/__init__.py      |    3 +++
 4 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 17a375f71ca00f49bc81d867caf39b8a25589472
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Aug 5 12:03:16 2013 +0200

    yum-cron: override the default stdout codec.  BZ 992797

diff --git a/yum-cron/yum-cron.py b/yum-cron/yum-cron.py
index 0f354e0..bdfaa28 100755
--- a/yum-cron/yum-cron.py
+++ b/yum-cron/yum-cron.py
@@ -17,6 +17,7 @@ import yum.updateinfo
 import smtplib
 from random import random
 from time import sleep
+from yum.misc import setup_locale
 
 # FIXME: is it really sane to use this from here?
 sys.path.append('/usr/share/yum-cli')
@@ -1110,6 +1111,7 @@ class YumCronBase(yum.YumBase):
 
 def main():
     """Configure and run the update check."""
+    setup_locale(override_time=True)
     # If a file name was passed in, use it as the config file name.
     base = None
     if len(sys.argv) > 1:
commit bba27df2b67108465c9d13cb9579b4896cc66818
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Thu Aug 1 16:21:19 2013 +0200

    Add a "--disableincludes" option to yum. BZ 911422

diff --git a/cli.py b/cli.py
index 8b6b983..0eece17 100755
--- a/cli.py
+++ b/cli.py
@@ -2208,11 +2208,8 @@ class YumOptionParser(OptionParser):
                 if opts.color != 'auto':
                     self.base.term.reinit(color=opts.color)
 
-            if opts.disableexcludes:
-                disable_excludes = self._splitArg(opts.disableexcludes)
-            else:
-                disable_excludes = []
-            self.base.conf.disable_excludes = disable_excludes
+            self.base.conf.disable_excludes = self._splitArg(opts.disableexcludes)
+            self.base.conf.disable_includes = self._splitArg(opts.disableincludes)
 
             for exclude in self._splitArg(opts.exclude):
                 try:
@@ -2375,6 +2372,9 @@ class YumOptionParser(OptionParser):
         group.add_option("", "--disableexcludes", default=[], action="append",
                 help=_("disable exclude from main, for a repo or for everything"),
                         metavar='[repo]')
+        group.add_option("", "--disableincludes", default=[], action="append",
+                help=_("disable includepkgs for a repo or for everything"),
+                        metavar='[repo]')
         group.add_option("--obsoletes", action="store_true", 
                 help=_("enable obsoletes processing during updates"))
         group.add_option("--noplugins", action="store_true", 
diff --git a/docs/yum.8 b/docs/yum.8
index 39dcbb8..fc0d9ef 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -804,6 +804,13 @@ main == disable excludes defined in [main] in yum.conf
 .br
 repoid == disable excludes defined for that repo
 .br
+.IP "\fB\-\-disableincludes=[all|repoid]\fP"
+Disable the includes defined in your config files. Takes one of two options:
+.br
+all == disable all includes
+.br
+repoid == disable includes defined for that repo
+.br
 .IP "\fB\-\-disableplugin=plugin\fP"
 Run with one or more plugins disabled, the argument is a comma separated list
 of wildcards to match against plugin names.
diff --git a/yum/__init__.py b/yum/__init__.py
index ef56957..dabb0d6 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2079,6 +2079,9 @@ much more problems).
 
         :param repo: the repository to use
         """
+        for di in getattr(self.conf, 'disable_includes', []):
+            if di == 'all' or di == repo.id:
+                return
         includelist = repo.getIncludePkgList()
         
         if len(includelist) == 0: