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

[Seth Vidal]

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

New commits:
commit b305ce16f6ba469bc88aa2300c99d17ac925c34f
Merge: 8453fd5... 0779beb...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Oct 3 15:30:06 2007 -0400

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      remove duplicate code; ensure that we reset what we've seen between depsolves
      don't delete non-existent attrs

commit 8453fd5672d8f7db79daa9e8292773d8402f46e0
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Oct 3 15:29:52 2007 -0400

    don't traceback on running kernel check

diff --git a/yum/misc.py b/yum/misc.py
index 101d3bd..4b78f4b 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -359,6 +359,7 @@ def get_running_kernel_version_release(ts):
     """This takes the output of uname and figures out the (version, release)
     tuple for the running kernel."""
     ver = os.uname()[2]
+    reduced = ver
     # FIXME this should probably get passed this list from somewhere in config
     # possibly from the kernelpkgnames option
     for s in ("bigmem", "enterprise", "smp", "hugemem", "PAE", "rt",
@@ -366,6 +367,7 @@ def get_running_kernel_version_release(ts):
               "PAE-debug"):
         if ver.endswith(s):
             reduced = ver.replace(s, "")
+            
     if reduced.find("-") != -1:
         (v, r) = reduced.split("-", 1)
         return (v, r)