vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-10-23 23:39:00 +02:00
parent 3471ecdfd9
commit e084ba1895
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2011-10-23 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/setjmp.S [__ia64__]: Include ./ia64/longjmp.S. * grub-core/lib/setjmp.S [__ia64__]: Include ./ia64/longjmp.S.

5
util/import_gcry.py
View file

@ -189,10 +189,9 @@ for cipher_file in cipher_files:
continue continue
else: else:
fw.write (holdline) fw.write (holdline)
m = re.match ("#include <.*>", line) m = re.match ("# *include <(.*)>", line)
if not m is None: if not m is None:
chmsg = "Removed including of %s" % \ chmsg = "Removed including of %s" % m.groups ()[0]
m.group () [len ("#include <"):len (m.group ()) - 1]
if nch: if nch:
chlognew = "%s\n %s" % (chlognew, chmsg) chlognew = "%s\n %s" % (chlognew, chmsg)
else: else: