From: Robert Ho <robert.hu@intel.com>
Date: Mon, 17 Aug 2015 03:34:04 +0000 (+0800)
Subject: Debian grub2: Optimize and re-format submenu parsing
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=840c63d16ca050c642718cade739362d8c6d1cc9;p=people%2Fiwj%2Fosstest.git

Debian grub2: Optimize and re-format submenu parsing

* space between ')' and '{'; and after '='
* omit unnecessary 'define' and '!defined' usage
* break long '{}' into several lines

Signed-off-by: Robert Ho <robert.hu@intel.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v14: Drop removal of MenuEntryPath setting in grub2 submenu parse
---

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index a8b62cad..2b8d9f3e 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -421,10 +421,10 @@ sub setupboot_grub2 ($$$$) {
             next if m/^\s*\#/ || !m/\S/;
             if (m/^\s*\}\s*$/) {
                 die unless $entry || $submenu;
-                if (!defined $entry && defined $submenu) {
+                if (!$entry && $submenu) {
                     logm("Met end of a submenu $submenu->{StartLine}..$.. ".
                         "Our want kern is $want_kernver");
-                    $submenu=undef;
+                    $submenu= undef;
                     pop @offsets;
                     $offsets[$#offsets]++;
                     next;
@@ -465,7 +465,9 @@ sub setupboot_grub2 ($$$$) {
             }
             if (m/^\s*menuentry\s+[\'\"](.*)[\'\"].*\{\s*$/) {
                 die $entry->{StartLine} if $entry;
-                $entry= { Title => $1, StartLine => $., MenuEntryPath => join ">", @offsets };
+                $entry= { Title => $1,
+			  StartLine => $.,
+			  MenuEntryPath => join ">", @offsets };
                 $offsets[$#offsets]++;
             }
             if (m/^\s*submenu\s+[\'\"](.*)[\'\"].*\{\s*$/) {