[yum-commits] 2 commits - yum/misc.py yum/yumRepo.py

[zpavlas at osuosl.org]

 yum/misc.py    |    2 +-
 yum/yumRepo.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0842c896c673e65896a6c873d334849e6003b775
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Wed Jun 26 12:41:52 2013 +0200

    Simple "import sys" fix. BZ 902357

diff --git a/yum/misc.py b/yum/misc.py
index ca00b3c..bb84815 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -5,6 +5,7 @@ Assorted utility functions for yum.
 
 import types
 import os
+import sys
 import os.path
 from cStringIO import StringIO
 import base64
@@ -991,7 +992,6 @@ def getloginuid():
 
 # ---------- i18n ----------
 import locale
-import sys
 def setup_locale(override_codecs=True, override_time=False):
     # This test needs to be before locale.getpreferredencoding() as that
     # does setlocale(LC_CTYPE, "")
commit 1cd30a1a39ae20721f926d4878ce83d1c8e32134
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Tue Jun 25 13:42:40 2013 +0200

    new_MD_files: set it up before downloading
    
    An old bug.. new_MD_files list is used when reverting to old metadata
    to clean up the (possibly partially) downloaded files.
    _commonRetrieveDataMD_done() is skipped on revert.

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 242ed66..3a85578 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -1570,7 +1570,7 @@ Insufficient space in download directory %s
             self._oldRepoMDData['old_MD_files'] = reverts
 
         # Inited twice atm. ... sue me
-        self._oldRepoMDData['new_MD_files'] = []
+        newmdfiles = self._oldRepoMDData['new_MD_files'] = []
         downloading = []
         for mdtype in all_mdtypes:
             (nmdtype, ndata) = self._get_mdtype_data(mdtype)
@@ -1609,6 +1609,7 @@ Insufficient space in download directory %s
             if self._groupCheckDataMDValid(ndata, nmdtype, mdtype):
                 continue
             downloading.append((ndata, nmdtype))
+            newmdfiles.append(self._get_mdtype_fname(ndata, False))
         return downloading
 
     def _commonRetrieveDataMD_done(self, downloading):
@@ -1616,7 +1617,6 @@ Insufficient space in download directory %s
 
         for (ndata, nmdtype) in downloading:
             local = self._get_mdtype_fname(ndata, False)
-            self._oldRepoMDData['new_MD_files'].append(local)
         self._doneOldRepoXML()
 
     def _groupLoadRepoXML(self, text=None, mdtypes=None):