[yum] update to latest HEAD

[James Antill]

commit c70c2c8c6c836834bab5cff97567b9fe276caecb
Author: James Antill <james at and.org>
Date:   Tue Mar 25 10:11:19 2014 -0400

    update to latest HEAD
    
    - Fix storing objects directly in the yumdb.
    - Don't store uuid as var_uuid, or we create it all the time.

 yum-HEAD.patch |   14 +++++++++-----
 yum.spec       |    7 ++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 28fac4e..1112a11 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -187046,7 +187046,7 @@ index c1af4ad..2c2f022 100644
      pass
      
 diff --git a/yum/__init__.py b/yum/__init__.py
-index 99039e0..56ec04d 100644
+index 99039e0..84ca658 100644
 --- a/yum/__init__.py
 +++ b/yum/__init__.py
 @@ -21,6 +21,7 @@ The Yum RPM software updater.
@@ -188113,7 +188113,7 @@ index 99039e0..56ec04d 100644
 +                    if var == 'releasever': continue
 +                    if var == 'basearch': continue # This "never" changes.
 +                    if var == 'arch':     continue
-+                    # Skip uuid?
++                    if var == 'uuid':     continue
 +                    setattr(po.yumdb_info, 'var_' + var, self.conf.yumvar[var])
 +                if oil:
 +                    po.yumdb_info.ts_install_langs = oil
@@ -197871,7 +197871,7 @@ index 3793bad..d5e50ac 100644
          pass
  
 diff --git a/yum/rpmsack.py b/yum/rpmsack.py
-index e289a7a..5b9f798 100644
+index e289a7a..138e53f 100644
 --- a/yum/rpmsack.py
 +++ b/yum/rpmsack.py
 @@ -48,6 +48,17 @@ def _open_no_umask(*args):
@@ -198263,8 +198263,12 @@ index e289a7a..5b9f798 100644
                                  'command_line'])
  
      def __init__(self, conf, pkgdir, yumdb_cache=None):
-@@ -1708,7 +1813,7 @@ class RPMDBAdditionalDataPackage(object):
+@@ -1706,9 +1811,11 @@ class RPMDBAdditionalDataPackage(object):
+         return os.path.normpath(self._mydir + '/' + attr)
+ 
      def _write(self, attr, value):
++        value = str(value)
++
          # check for self._conf.writable before going on?
          if not os.path.exists(self._mydir):
 -            os.makedirs(self._mydir)
@@ -198272,7 +198276,7 @@ index e289a7a..5b9f798 100644
  
          attr = _sanitize(attr)
          if attr in self._read_cached_data:
-@@ -1753,7 +1858,7 @@ class RPMDBAdditionalDataPackage(object):
+@@ -1753,7 +1860,7 @@ class RPMDBAdditionalDataPackage(object):
          if attr.endswith('.tmp'):
              raise AttributeError, "%s has no attribute %s" % (self, attr)
  
diff --git a/yum.spec b/yum.spec
index 9d02854..0b8835e 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: 142%{?dist}
+Release: 143%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -507,6 +507,11 @@ exit 0
 %endif
 
 %changelog
+* Mon Mar 25 2014 James Antill <james at fedoraproject.org> - 3.4.3-143
+- update to latest HEAD
+- Fix storing objects directly in the yumdb.
+- Don't store uuid as var_uuid, or we create it all the time.
+
 * Mon Mar 25 2014 James Antill <james at fedoraproject.org> - 3.4.3-142
 - update to latest HEAD
 - No error for refilter cleanup, rm dirs. and eat all errors. BZ 1062959.