summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2019-09-07 17:49:15 (GMT)
committerGitHub <noreply@github.com>2019-09-07 17:49:15 (GMT)
commitf421924ca49874df2568d92c071805b87598c3f4 (patch)
tree9b0df104e7070ef4a02a65bd6ec35bad085827c0 /bin
parent91e718a08ceffd0b2b00026adec18ffcd7051cd2 (diff)
parenta9d0c090c02491d7dec0e54688e9a819d0229732 (diff)
downloadSCons-f421924ca49874df2568d92c071805b87598c3f4.zip
SCons-f421924ca49874df2568d92c071805b87598c3f4.tar.gz
SCons-f421924ca49874df2568d92c071805b87598c3f4.tar.bz2
Merge branch 'master' into remove_aegis_bits_issue_2639
Diffstat (limited to 'bin')
-rw-r--r--bin/SConsExamples.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/SConsExamples.py b/bin/SConsExamples.py
index 7491c58..501169e 100644
--- a/bin/SConsExamples.py
+++ b/bin/SConsExamples.py
@@ -882,7 +882,7 @@ def create_scons_output(e):
lines = ExecuteCommand(args, command, t, {'osname':o.os, 'tools':o.tools})
if not command.output and lines:
ncontent = '\n'.join(lines)
- ncontent = address_re.sub(r' at 0x700000&gt;', ncontent)
+ ncontent = address_re.sub(r' at 0x700000>', ncontent)
ncontent = engine_re.sub(r' File "bootstrap/src/engine/SCons/', ncontent)
ncontent = file_re.sub(r'\1 <module>', ncontent)
ncontent = nodelist_re.sub(r"\1 'NodeList' object \2", ncontent)