diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-28 18:23:35 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-28 18:23:35 +0200 |
| commit | 726a5c6687817cf8694aaa05474c7662b1b19f80 (patch) | |
| tree | adb3d5b06eb5e10c991e9c0dd21eb17b46f46189 /engine/SCons/Scanner/Dir.py | |
| parent | a3720dc6ef48bd5f9323a0f772f17b0fb0b29263 (diff) | |
| parent | 72c39ad485d174c2e8e1fef34b8e9e392a94458a (diff) | |
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'engine/SCons/Scanner/Dir.py')
| -rw-r--r-- | engine/SCons/Scanner/Dir.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/SCons/Scanner/Dir.py b/engine/SCons/Scanner/Dir.py index 9ede571..7565423 100644 --- a/engine/SCons/Scanner/Dir.py +++ b/engine/SCons/Scanner/Dir.py @@ -20,7 +20,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Scanner/Dir.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/Dir.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog" import SCons.Node.FS import SCons.Scanner @@ -77,7 +77,7 @@ def scan_on_disk(node, env, path=()): that and then call the in-memory scanning function. """ try: - flist = node.fs.listdir(node.abspath) + flist = node.fs.listdir(node.get_abspath()) except (IOError, OSError): return [] e = node.Entry |