[yum-commits] Branch 'yum-3_2_X' - 2 commits - yumcommands.py yum/rpmsack.py

[James Antill]

 yum/rpmsack.py |    2 +-
 yumcommands.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 191507d0c9ccc3a66c8f6beacd73145dca58248d
Author: James Antill <james at and.org>
Date:   Tue Apr 19 14:56:05 2011 -0400

    Fix forced umask settings for yumdb/etc., 0 => 022.

diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 753a05e..e289a7a 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -40,7 +40,7 @@ import yum.depsolve
 def _open_no_umask(*args):
     """ Annoying people like to set umask's for root, which screws everything
         up for user readable stuff. """
-    oumask = os.umask(0)
+    oumask = os.umask(022)
     try:
         ret = open(*args)
     finally:
commit b84f90c24148b44b2c615a8ccf07b50d7308c621
Author: James Antill <james at and.org>
Date:   Tue Apr 19 14:47:20 2011 -0400

    Don't show first url for mirrors, if we are using baseurl. BZ 697885.

diff --git a/yumcommands.py b/yumcommands.py
index 8e148a9..d3014c5 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -982,7 +982,7 @@ class RepoListCommand(YumCommand):
                     elif repo.mirrorlist:
                         out += [base.fmtKeyValFill(_("Repo-mirrors : "),
                                                    repo.mirrorlist)]
-                    if enabled and repo.urls:
+                    if enabled and repo.urls and not baseurls:
                         url = repo.urls[0]
                         if len(repo.urls) > 1:
                             url += ' (%d more)' % (len(repo.urls) - 1)