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

diff --git a/ChangeLog b/ChangeLog
index 6daca72140e64274bbb0ad610256f57b82662460..fc5ab9806ba5a23fa4303dac60d94d0a1e0c0692 100644 (file)
--- 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 720f1930312a6ab5fac556980ec6e7607000bea1..befa5ef5fbe86c0f20225c36b578c42e31197163 100644 (file)
--- 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: