diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-05-29 01:41:22 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-05-29 01:41:22 (GMT) |
| commit | 59efed12aebfcefcbcab1793e57d7b51552d7c2e (patch) | |
| tree | a4fb551ec96edbf470efa612dcceeb9f2213695c /src/engine/SCons/Node/FS.py | |
| parent | e37968dcdb65b228ec5bf0f738ca9121dd9282f2 (diff) | |
| download | SCons-59efed12aebfcefcbcab1793e57d7b51552d7c2e.zip SCons-59efed12aebfcefcbcab1793e57d7b51552d7c2e.tar.gz SCons-59efed12aebfcefcbcab1793e57d7b51552d7c2e.tar.bz2 | |
Fix issue #2419 by sorting the other return path from glob() in FS.py. Thanks to Jin Liu for the original analysis of the problem.
Diffstat (limited to 'src/engine/SCons/Node/FS.py')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index c34cfed..9fdac79 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -1953,7 +1953,9 @@ class Dir(Base): """ dirname, basename = os.path.split(pathname) if not dirname: - return self._glob1(basename, ondisk, source, strings) + result = self._glob1(basename, ondisk, source, strings) + result.sort(lambda a, b: cmp(str(a), str(b))) + return result if has_glob_magic(dirname): list = self.glob(dirname, ondisk, source, strings=False) else: |