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

[skvidal at osuosl.org]

 yum/misc.py |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2295e11b4d9472f18fb42c7a1834e8733578bec4
Merge: 7244b6e... 21fe4ef...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Nov 16 13:59:33 2009 -0500

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Document --releasever
      Fix UnicodeDecodeErrors in yumcommands.py
      Docstring typo fix.
      Add po/Makevars for gettext plural handling
      Wrap License field, due to 100+ char. joy in Fedora

commit 7244b6e23512af9c4f8505ae3e0392fcd60031cc
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Nov 16 11:40:09 2009 -0500

    ignore transaction files which end with 'disabled' - so we can keep ones which are wonky
    around for debugging but not pester the user with them.

diff --git a/yum/misc.py b/yum/misc.py
index ee1da35..efff267 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -683,6 +683,8 @@ def find_unfinished_transactions(yumlibpath='/var/lib/yum'):
     tsdones = glob.glob(tsdoneg)
 
     for fn in tsalls:
+        if fn.endswith('disabled'):
+            continue
         trans = os.path.basename(fn)
         timestamp = trans.replace('transaction-all.','')
         timestamps.append(timestamp)