[Xen-changelog] [xen-unstable] pygrub: Fix Grub2 support for Ubuntu 10.04

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1271349415 -3600
# Node ID ffffddc4b1e030cce6bd4d12c4409c94599c1abf
# Parent  3e56823eb20911d341ee62596d6a2adb3daa49cf
pygrub: Fix Grub2 support for Ubuntu 10.04

Due to changes in grub2, menu entry titles now have single quote
around them rather than double quotes, but the memtest entries still
are using double quotes, so we need to catch both.

Signed-off-by: David Markey <david.markey@xxxxxxxxxx>
---
 tools/pygrub/src/GrubConf.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 3e56823eb209 -r ffffddc4b1e0 tools/pygrub/src/GrubConf.py
--- a/tools/pygrub/src/GrubConf.py      Thu Apr 15 17:36:16 2010 +0100
+++ b/tools/pygrub/src/GrubConf.py      Thu Apr 15 17:36:55 2010 +0100
@@ -379,7 +379,7 @@ class Grub2ConfigFile(_GrubConfigFile):
                 continue
 
             # new image
-            title_match = re.match('^menuentry "(.*)" (.*){', l)
+            title_match = re.match('^menuentry ["\'](.*)["\'] (.*){', l)
             if title_match:
                 if img is not None:
                     raise RuntimeError, "syntax error: cannot nest menuentry 
(%d %s)" % (len(img),img)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog