diff options
| author | Steven Knight <knight@baldmt.com> | 2002-09-05 00:04:32 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-09-05 00:04:32 (GMT) |
| commit | 246819663b8eaeb130580f4b97990248f26eaadd (patch) | |
| tree | f9ca305b654b4d35be2ba9a59bc85f341b916ac4 /src/engine/SCons/Tool/tar.py | |
| parent | 08ecd797ee635637097196960ea6a90e8dd29d62 (diff) | |
| download | SCons-246819663b8eaeb130580f4b97990248f26eaadd.zip SCons-246819663b8eaeb130580f4b97990248f26eaadd.tar.gz SCons-246819663b8eaeb130580f4b97990248f26eaadd.tar.bz2 | |
Fix the tests that broke from the tool auto-detect stuff. (Anthony Roach and SK)
Diffstat (limited to 'src/engine/SCons/Tool/tar.py')
| -rw-r--r-- | src/engine/SCons/Tool/tar.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/engine/SCons/Tool/tar.py b/src/engine/SCons/Tool/tar.py index 0acfd56..4cf88ba 100644 --- a/src/engine/SCons/Tool/tar.py +++ b/src/engine/SCons/Tool/tar.py @@ -39,12 +39,6 @@ import SCons.Util tars = ['gtar', 'tar'] -for i in tars: - if SCons.Util.WhereIs(i): - tar = i - break - tar = None - TarBuilder = SCons.Builder.Builder(action = '$TARCOM', source_factory = SCons.Node.FS.default_fs.Entry, suffix = '$TARSUFFIX', @@ -59,10 +53,10 @@ def generate(env, platform): bld = TarBuilder env['BUILDERS']['Tar'] = bld - env['TAR'] = tar + env['TAR'] = SCons.Util.Detect(tars, env) or 'gtar' env['TARFLAGS'] = '-c' env['TARCOM'] = '$TAR $TARFLAGS -f $TARGET $SOURCES' env['TARSUFFIX'] = '.tar' -def exists(): - return tar +def exists(env): + return SCons.Util.Detect(tars, env) |