[yum] update to latest HEAD

James Antill james at fedoraproject.org
Mon Feb 24 02:01:17 UTC 2014


commit 9928581d095dd6ed4530802428b7f1001ea6d8e1
Author: James Antill <james at and.org>
Date:   Sun Feb 23 21:02:03 2014 -0500

    update to latest HEAD
    
    - Fix yum.conf file saving for filters.

 yum-HEAD.patch |    8 +++++---
 yum.spec       |    6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 8ca4525..f5b2593 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -200403,7 +200403,7 @@ index e5e9ece..35359e2 100644
          fo = None
  
 diff --git a/yumcommands.py b/yumcommands.py
-index 4dcbea7..4385a34 100644
+index 4dcbea7..ef84c1f 100644
 --- a/yumcommands.py
 +++ b/yumcommands.py
 @@ -13,6 +13,7 @@
@@ -203406,7 +203406,7 @@ index 4dcbea7..4385a34 100644
          chkcmd = 'all'
          if extcmds:
              chkcmd = extcmds
-@@ -1505,33 +3189,1734 @@ class CheckRpmdbCommand(YumCommand):
+@@ -1505,33 +3189,1736 @@ class CheckRpmdbCommand(YumCommand):
          return rc, ['%s %s' % (basecmd, chkcmd)]
  
      def needTs(self, base, basecmd, extcmds):
@@ -204860,7 +204860,9 @@ index 4dcbea7..4385a34 100644
 +            if not os.path.exists(fn):
 +                # Try the old default
 +                nfn = base.conf.installroot+'/etc/yum.conf'
-+                if not os.path.exists(nfn):
++                if os.path.exists(nfn):
++                    fn = nfn
++                else:
 +                    shutil.copy2(base.conf.config_file_path, fn)
 +            ybc = base.conf
 +            writeRawConfigFile(fn, 'main', ybc.yumvar,
diff --git a/yum.spec b/yum.spec
index 7266f62..82b9c3c 100644
--- a/yum.spec
+++ b/yum.spec
@@ -64,7 +64,7 @@ BuildRequires: bash-completion
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.4.3
-Release: 139%{?dist}
+Release: 140%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -507,6 +507,10 @@ exit 0
 %endif
 
 %changelog
+* Sun Feb 23 2014 James Antill <james at fedoraproject.org> - 3.4.3-140
+- update to latest HEAD
+- Fix yum.conf file saving for filters.
+
 * Fri Feb 21 2014 James Antill <james at fedoraproject.org> - 3.4.3-139
 - update to latest HEAD
 - Copy packages in/out of an installroot, for no downloads creating containers.


More information about the scm-commits mailing list