Changes between Version 1 and Version 3 of Ticket #296
- Timestamp:
- Nov 23, 2012, 11:37:23 AM (12 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Ticket #296 – Description
v1 v3 13 13 else: 14 14 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 17 17 @@ -368,6 +368,7 @@ 18 18 in_function = False … … 27 27 title = title_match.group(1) 28 28 continue 29 -30 29 + 31 30 + if l.startswith("submenu"): 32 31 + menu_level += 1 33 32 + continue 34 + 33 35 34 if l.startswith("}"): 36 35 if img is None: … … 41 40 + else: 42 41 + raise RuntimeError, "syntax error: closing brace without menuentry" 43 42 44 43 self.add_image(Grub2Image(title, img)) 45 44 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,)) 46 54 --- /usr/lib/xen-4.0/bin/pygrub.orig 2012-09-05 16:28:03.105813164 -0400 47 55 +++ /usr/lib/xen-4.0/bin/pygrub 2012-09-05 16:29:57.168849770 -0400