From: Zac Medico Date: Sun, 9 Mar 2008 02:36:47 +0000 (-0000) Subject: Fix var_assign_re to recognize a call to the 'declare' builtin even when X-Git-Tag: v2.2_pre5~30 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0d4857c5d5d600641efa366f0fc769d17368caac;p=portage.git Fix var_assign_re to recognize a call to the 'declare' builtin even when no options are given. svn path=/main/trunk/; revision=9456 --- diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py index bac104f13..d3434ff0e 100755 --- a/bin/filter-bash-environment.py +++ b/bin/filter-bash-environment.py @@ -9,7 +9,7 @@ here_doc_re = re.compile(r'.*\s<<[-]?(\w+)$') func_start_re = re.compile(r'^[-\w]+\s*\(\)\s*$') func_end_re = re.compile(r'^\}$') -var_assign_re = re.compile(r'(^|^declare\s+-\S+\s+|^export\s+)([^=\s]+)=("|\')?.*$') +var_assign_re = re.compile(r'(^|^declare\s+-\S+\s+|^declare\s+|^export\s+)([^=\s]+)=("|\')?.*$') close_quote_re = re.compile(r'(\\"|"|\')\s*$') readonly_re = re.compile(r'^declare\s+-(\S*)r(\S*)\s+')