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

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1271355673 -3600
# Node ID aaa44801de3668c4cad3c0f7180532daf91288e5
# Parent  5d67dff1d1f72453e60123ebdddde8936e255271
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 5d67dff1d1f7 -r aaa44801de36 tools/pygrub/src/GrubConf.py
--- a/tools/pygrub/src/GrubConf.py      Thu Apr 15 19:21:00 2010 +0100
+++ b/tools/pygrub/src/GrubConf.py      Thu Apr 15 19:21:13 2010 +0100
@@ -341,7 +341,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