Changes between Version 1 and Version 3 of Ticket #296


Ignore:
Timestamp:
Nov 23, 2012, 11:37:23 AM (11 years ago)
Author:
ezyang
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #296 – Description

    v1 v3  
    1313                 else:
    1414                     logging.info("Ignored directive %s" %(com,))
    15 --- /usr/lib/xen-4.0/lib/python/grub/GrubConf.py.orig
    16 +++ /usr/lib/xen-4.0/lib/python/grub/GrubConf.py
     15--- /usr/lib/xen-4.0/lib/python/grub/GrubConf.py.orig   2012-09-08 07:49:38.000000000 -0400
     16+++ /usr/lib/xen-4.0/lib/python/grub/GrubConf.py        2012-11-23 11:35:57.627617131 -0500
    1717@@ -368,6 +368,7 @@
    1818         in_function = False
    … …  
    2727                 title = title_match.group(1)
    2828                 continue
    29 -
    3029+
    3130+            if l.startswith("submenu"):
    3231+                menu_level += 1
    3332+                continue
    34 +
     33             
    3534             if l.startswith("}"):
    3635                 if img is None:
    … …  
    4140+                    else:
    4241+                        raise RuntimeError, "syntax error: closing brace without menuentry"
    43 
     42 
    4443                 self.add_image(Grub2Image(title, img))
    4544                 img = None
     45@@ -414,6 +423,8 @@
     46                 
     47             if self.commands.has_key(com):
     48                 if self.commands[com] is not None:
     49+                    if arg.strip() == "${saved_entry}":
     50+                        arg = "0"
     51                     setattr(self, self.commands[com], arg.strip())
     52                 else:
     53                     logging.info("Ignored directive %s" %(com,))
    4654--- /usr/lib/xen-4.0/bin/pygrub.orig    2012-09-05 16:28:03.105813164 -0400
    4755+++ /usr/lib/xen-4.0/bin/pygrub 2012-09-05 16:29:57.168849770 -0400