diff options
| author | Steven Knight <knight@baldmt.com> | 2004-09-20 20:25:31 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-09-20 20:25:31 (GMT) |
| commit | fec8f3c96bedd45fe3f0c594f2bdec8389cef108 (patch) | |
| tree | 6f68448cf9e1390d253fead8cd30305641c79e0a /src | |
| parent | ddc11499f2a5074965cf5574b9a6728564c4984c (diff) | |
| download | SCons-fec8f3c96bedd45fe3f0c594f2bdec8389cef108.zip SCons-fec8f3c96bedd45fe3f0c594f2bdec8389cef108.tar.gz SCons-fec8f3c96bedd45fe3f0c594f2bdec8389cef108.tar.bz2 | |
Fix handling when BuildDir exists but is unwriteable. Add Stop. to messages at SConscript-read time. (Kevin Quick)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3fc014f..000c943 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -123,6 +123,9 @@ RELEASE 0.97 - XXX function, use its strfunction() method (if any) to display the action. + - Fix handling when BuildDir() exists but is unwriteable. Add + "Stop." to those error messages for consistency. + From Christoph Wiedemann: - Add an Environment.SetDefault() method that only sets values if diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 7f60c7b..5015c84 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -1675,7 +1675,7 @@ class File(Base): try: Link(self, src, None) except SCons.Errors.BuildError, e: - desc = "Cannot duplicate `%s' in `%s': %s." % (src, self.dir, e.errstr) + desc = "Cannot duplicate `%s' in `%s': %s." % (src.path, self.dir.path, e.errstr) raise SCons.Errors.StopError, desc self.linked = 1 # The Link() action may or may not have actually diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 160fae3..4832b02 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -912,9 +912,9 @@ def _main(args, parser): # couldn't be copied in to the BuildDir. Since we're just # reading SConscript files and haven't started building # things yet, stop regardless of whether they used -i or -k - # or anything else, but don't say "Stop." on the message. + # or anything else. global exit_status - sys.stderr.write("scons: *** %s\n" % e) + sys.stderr.write("scons: *** %s Stop.\n" % e) exit_status = 2 sys.exit(exit_status) global sconscript_time |