diff options
| author | Steven Knight <knight@baldmt.com> | 2002-03-16 04:38:43 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-03-16 04:38:43 (GMT) |
| commit | 0bfa6712f6b0ba40f7df806ec35a40fa056f026f (patch) | |
| tree | 821e70780eb384562d222a2e8cbfe8f4e78a430d /src/engine/SCons/Environment.py | |
| parent | d274d685b3fae62354a7c3deb0622e2edd81b0c7 (diff) | |
| download | SCons-0bfa6712f6b0ba40f7df806ec35a40fa056f026f.zip SCons-0bfa6712f6b0ba40f7df806ec35a40fa056f026f.tar.gz SCons-0bfa6712f6b0ba40f7df806ec35a40fa056f026f.tar.bz2 | |
Make FunctionAction arguments be Nodes, not strings. (Charles Crain)
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 49249f3..d90e029 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -45,22 +45,22 @@ import shutil def installFunc(env, target, source): try: - os.unlink(target) + map(lambda t: os.unlink(str(t)), target) except OSError: pass try: - SCons.Node.FS.file_link(source[0], target) + SCons.Node.FS.file_link(str(source[0]), str(target[0])) print 'Install file: "%s" as "%s"' % \ - (source[0], target) + (source[0], target[0]) return 0 except IOError, e: sys.stderr.write('Unable to install "%s" as "%s"\n%s\n' % \ - (source[0], target, str(e))) + (source[0], target[0], str(e))) return -1 except OSError, e: sys.stderr.write('Unable to install "%s" as "%s"\n%s\n' % \ - (source[0], target, str(e))) + (source[0], target[0], str(e))) return -1 InstallBuilder = SCons.Builder.Builder(name='Install', |