diff options
author | Steven Knight <knight@baldmt.com> | 2009-01-18 19:33:53 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2009-01-18 19:33:53 (GMT) |
commit | 6d699199b32405f27c8e76b5164bdc57fcd69602 (patch) | |
tree | 05c369c0cf64c9d7514b08db774ba6512cc587ca /src/engine/SCons/Node | |
parent | 79a086c22c6964a04ab88a382aaba3626c216b5a (diff) | |
download | SCons-6d699199b32405f27c8e76b5164bdc57fcd69602.zip SCons-6d699199b32405f27c8e76b5164bdc57fcd69602.tar.gz SCons-6d699199b32405f27c8e76b5164bdc57fcd69602.tar.bz2 |
Various Windows fixes:
* Restore correct code to detect a bad drive on Windows.
* Update the bad drive error message to include the target name.
* Update SConfTests.py to print the config.log on error.
* Fix the smart_link() error message to not use repr() of a path so
escaping the \ separators on Windows doesn't interfere with regex matchs.
* Update regexes in test/VariantDir/reflect.py to accomodate command-line
re-ordering to put the /OUT: first in the line.
* Explicitly check for smart_link() messages even on Windows.
Diffstat (limited to 'src/engine/SCons/Node')
-rw-r--r-- | src/engine/SCons/Node/FS.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 9da9d8e..3742f34 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -1601,9 +1601,12 @@ class Dir(Base): if parent.exists(): break listDirs.append(parent) - parent = parent.up() - else: - raise SCons.Errors.StopError, parent.path + p = parent.up() + if p is None: + # Don't use while: - else: for this condition because + # if so, then parent is None and has no .path attribute. + raise SCons.Errors.StopError, parent.path + parent = p listDirs.reverse() for dirnode in listDirs: try: |