Detect implicit command dependencies even when the command is quoted.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py
index e106e74..96a48a7 100644
--- a/src/engine/SCons/Action.py
+++ b/src/engine/SCons/Action.py
@@ -102,6 +102,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import cPickle
 import dis
 import os
+import re
 import string
 import sys
 import subprocess
@@ -154,6 +155,8 @@ else:
                 i = i+1
         return string.join(result, '')
 
+strip_quotes = re.compile('^[\'"](.*)[\'"]$')
+
 
 def _callable_contents(obj):
     """Return the signature contents of a callable Python object.
@@ -822,7 +825,11 @@ class CommandAction(_ActionAction):
         res = []
         for cmd_line in cmd_list:
             if cmd_line:
-                d = env.WhereIs(str(cmd_line[0]))
+                d = str(cmd_line[0])
+                m = strip_quotes.match(d)
+                if m:
+                    d = m.group(1)
+                d = env.WhereIs(d)
                 if d:
                     res.append(env.fs.File(d))
         return res