2009/stable/system/base/grub - Merge from devel/system/base/grub/

[Ozan Çağlayan]

Author: ozan.caglayan
Date: Wed Jan 20 09:45:24 2010
New Revision: 85050

Modified:
   2009/stable/system/base/grub/   (props changed)
   2009/stable/system/base/grub/comar/bootloader.py
   2009/stable/system/base/grub/pspec.xml
Log:
Merge from devel/system/base/grub/:

rev. 84568, by bahadir.kandemir on 2010-01-13
Fixed Boot.Loader backend's UUID problems.

rev. 85049, by ozan.caglayan on 2010-01-20
Handle TypeError's in bootloader.py

---
 comar/bootloader.py |    2 +-
 pspec.xml           |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

Modified: 2009/stable/system/base/grub/comar/bootloader.py
=================================================================
--- 2009/stable/system/base/grub/comar/bootloader.py	(original)
+++ 2009/stable/system/base/grub/comar/bootloader.py	Wed Jan 20 09:45:24 2010
@@ -204,7 +204,7 @@
             version = e_kernel.value.split("kernel-")[1].split(" ")[0]
             try:
                 version, suffix = parseVersion("kernel-%s" % version)
-            except ValueError:
+            except (ValueError, TypeError):
                 __addItem("other", i)
                 continue
             if suffix:

Modified: 2009/stable/system/base/grub/pspec.xml
=================================================================
--- 2009/stable/system/base/grub/pspec.xml	(original)
+++ 2009/stable/system/base/grub/pspec.xml	Wed Jan 20 09:45:24 2010
@@ -121,6 +121,13 @@
     </Package>
 
     <History>
+        <Update release="74">
+            <Date>2010-01-20</Date>
+            <Version>0.97</Version>
+            <Comment>Handle TypeError's in bootloader.py</Comment>
+            <Name>Ozan Çağlayan</Name>
+            <Email>ozan at pardus.org.tr</Email>
+        </Update>
         <Update release="73">
             <Date>2010-01-13</Date>
             <Version>0.97</Version>