From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 Oct 2011 21:39:00 +0000 (+0200)
Subject: 	* util/import_gcry.py: Accept space between # and include.
X-Git-Tag: 2.00~1075
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e084ba18957266042721af925a58d744daf8b842;p=thirdparty%2Fgrub.git

	* util/import_gcry.py: Accept space between # and include.
---

diff --git a/ChangeLog b/ChangeLog
index 6daca7214..fc5ab9806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/import_gcry.py: Accept space between # and include.
+
 2011-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/setjmp.S [__ia64__]: Include ./ia64/longjmp.S.
diff --git a/util/import_gcry.py b/util/import_gcry.py
index 720f19303..befa5ef5f 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -189,10 +189,9 @@ for cipher_file in cipher_files:
                     continue
                 else:
                     fw.write (holdline)
-            m = re.match ("#include <.*>", line)
+            m = re.match ("# *include <(.*)>", line)
             if not m is None:
-                chmsg = "Removed including of %s" % \
-                m.group () [len ("#include <"):len (m.group ()) - 1]
+                chmsg = "Removed including of %s" % m.groups ()[0]
                 if nch:
                     chlognew = "%s\n	%s" % (chlognew, chmsg)
                 else: