[yum-commits] 2 commits - yum/__init__.py yum/rpmsack.py

[James Antill]

 yum/__init__.py |    2 +-
 yum/rpmsack.py  |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b953658e285337851bd38b1f2027c2f9cc82c3c7
Author: James Antill <james at and.org>
Date:   Tue Mar 25 10:09:05 2014 -0400

    Skip uuid now, for ostree/etc.

diff --git a/yum/__init__.py b/yum/__init__.py
index 56ec04d..84ca658 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1956,7 +1956,7 @@ much more problems).
                     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
commit 15f8266f316977e5693d6855915f5d24bc22bf89
Author: James Antill <james at and.org>
Date:   Tue Mar 25 10:08:47 2014 -0400

    Make sure we've converted yumdb objects to strings.

diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 5b9f798..138e53f 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -1811,6 +1811,8 @@ 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):
             _makedirs_no_umask(self._mydir)