[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2238] 2009-05-26 Pavel Roskin <address@hidden>
From: |
Pavel Roskin |
Subject: |
[2238] 2009-05-26 Pavel Roskin <address@hidden> |
Date: |
Tue, 26 May 2009 23:19:43 +0000 |
Revision: 2238
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2238
Author: proski
Date: 2009-05-26 23:19:42 +0000 (Tue, 26 May 2009)
Log Message:
-----------
2009-05-26 Pavel Roskin <address@hidden>
* genmk.rb: Avoid shadowing variable `s', rename the outer `s'
to `str'.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/genmk.rb
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-05-26 20:47:00 UTC (rev 2237)
+++ trunk/grub2/ChangeLog 2009-05-26 23:19:42 UTC (rev 2238)
@@ -1,5 +1,8 @@
2009-05-26 Pavel Roskin <address@hidden>
+ * genmk.rb: Avoid shadowing variable `s', rename the outer `s'
+ to `str'.
+
* util/getroot.c (grub_util_get_dev_abstraction): Mark os_dev as
possibly unused.
Modified: trunk/grub2/genmk.rb
===================================================================
--- trunk/grub2/genmk.rb 2009-05-26 20:47:00 UTC (rev 2237)
+++ trunk/grub2/genmk.rb 2009-05-26 23:19:42 UTC (rev 2238)
@@ -304,20 +304,20 @@
print "# Generated by genmk.rb, please don't edit!\n"
cont = false
-s = nil
+str = nil
while l = gets
if cont
- s += l
+ str += l
else
- s = l
+ str = l
end
print l
cont = (/\\$/ =~ l)
unless cont
- s.gsub!(/\\\n/, ' ')
+ str.gsub!(/\\\n/, ' ')
- if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ s
+ if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ str
var, args = $1, $2
if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2238] 2009-05-26 Pavel Roskin <address@hidden>,
Pavel Roskin <=