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

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1271355529 -3600
# Node ID 065efaec5e7168cd4fcbfbf3203a6a973017e43c
# Parent  ef143c1e5d539571edb71bf93a40cfaa05dfbadf
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>
xen-unstable changeset:   21188:ffffddc4b1e0
xen-unstable date:        Thu Apr 15 17:36:55 2010 +0100
---
 tools/pygrub/src/GrubConf.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r ef143c1e5d53 -r 065efaec5e71 tools/pygrub/src/GrubConf.py
--- a/tools/pygrub/src/GrubConf.py      Thu Apr 15 19:18:16 2010 +0100
+++ b/tools/pygrub/src/GrubConf.py      Thu Apr 15 19:18:49 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