diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-04-20 17:03:01 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-04-20 17:03:01 (GMT) |
| commit | 8a1a4804a56a469c32aaa1c3b1310383b3befa54 (patch) | |
| tree | d431ed534dade001ab1f057275130bbdd45e7c9d /src/engine/SCons/Tool/zip.py | |
| parent | 1411faab72ab26f640bdaa145ffc3510669941bd (diff) | |
| download | SCons-8a1a4804a56a469c32aaa1c3b1310383b3befa54.zip SCons-8a1a4804a56a469c32aaa1c3b1310383b3befa54.tar.gz SCons-8a1a4804a56a469c32aaa1c3b1310383b3befa54.tar.bz2 | |
Added tests for ZIPROOT, and tweaked the ZIPROOT doc a bit.
Also cleaned up the ZIP tests by assuming that python
has the zipfile module, which has been true since python 1.6.
Diffstat (limited to 'src/engine/SCons/Tool/zip.py')
| -rw-r--r-- | src/engine/SCons/Tool/zip.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/zip.py b/src/engine/SCons/Tool/zip.py index 1cfe541..2613bfc 100644 --- a/src/engine/SCons/Tool/zip.py +++ b/src/engine/SCons/Tool/zip.py @@ -57,9 +57,9 @@ if internal_zip: for fname in filenames: path = os.path.join(dirpath, fname) if os.path.isfile(path): - zf.write(path, os.path.relpath(path, env.get('ZIPROOT', ''))) + zf.write(path, os.path.relpath(path, str(env.get('ZIPROOT', '')))) else: - zf.write(str(s), os.path.relpath(str(s), env.get('ZIPROOT', ''))) + zf.write(str(s), os.path.relpath(str(s), str(env.get('ZIPROOT', '')))) zf.close() else: zipcompression = 0 |