diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/oe-stylize.py | 8 | ||||
| -rwxr-xr-x | contrib/pw-am.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index e1ba1b321..30b460e12 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -210,8 +210,8 @@ OE_vars = [ 'others' ] -varRegexp = r'^([a-zA-Z_0-9${}-]*)([ \t]*)([+.:]?=[+.]?)([ \t]*)([^\t]+)' -routineRegexp = r'^([a-zA-Z0-9_ ${}-]+?)\(' +varRegexp = r'^([a-zA-Z_0-9${}:-]*)([ \t]*)([+.:]?=[+.]?)([ \t]*)([^\t]+)' +routineRegexp = r'^([a-zA-Z0-9_ ${}:-]+?)\(' # Variables seen in the processed .bb seen_vars = {} @@ -369,7 +369,7 @@ if __name__ == "__main__": line = line.expandtabs().rstrip() # ignore empty lines (or line filled with spaces or tabs only) # so that rule6 is always respected - if line is not '': + if line != '': lines.append(line) # -- parse the file -- @@ -386,7 +386,7 @@ if __name__ == "__main__": line = follow_rule(6, line) # ignore empty lines - if line.isspace() or line is '': + if line.isspace() or line == '': # flush comments into the olines for c in commentBloc: olines.append(c) diff --git a/contrib/pw-am.sh b/contrib/pw-am.sh index 8987eee8e..d9d1187b0 100755 --- a/contrib/pw-am.sh +++ b/contrib/pw-am.sh @@ -9,7 +9,7 @@ for patchnumber in $@; do - wget -nv http://patches.openembedded.org/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch + wget -nv http://patchwork.yoctoproject.org/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch git am -s pw-am-$patchnumber.patch rm pw-am-$patchnumber.patch done |