diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
| commit | 07fc59e19636a4fc97a18b2038f3fe1c72a94000 (patch) | |
| tree | 79d4a6239d81b2ccb4752d4f5ca25e0a7d3b4d4b /engine/SCons/Tool/ipkg.py | |
| parent | 7f642861f3946d4241cbd668de258293ba92767a (diff) | |
| parent | 340d57481935334465037d97c0db1555b70c0eb1 (diff) | |
Merge commit 'upstream/2.0.0'
Diffstat (limited to 'engine/SCons/Tool/ipkg.py')
| -rw-r--r-- | engine/SCons/Tool/ipkg.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engine/SCons/Tool/ipkg.py b/engine/SCons/Tool/ipkg.py index 3e8d223..c692053 100644 --- a/engine/SCons/Tool/ipkg.py +++ b/engine/SCons/Tool/ipkg.py @@ -33,10 +33,9 @@ packages fake_root. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/ipkg.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Tool/ipkg.py 5023 2010/06/14 22:05:46 scons" import os -import string import SCons.Builder @@ -53,11 +52,8 @@ def generate(env): env['IPKG'] = 'ipkg-build' env['IPKGCOM'] = '$IPKG $IPKGFLAGS ${SOURCE}' - # TODO(1.5) - #env['IPKGUSER'] = os.popen('id -un').read().strip() - #env['IPKGGROUP'] = os.popen('id -gn').read().strip() - env['IPKGUSER'] = string.strip(os.popen('id -un').read()) - env['IPKGGROUP'] = string.strip(os.popen('id -gn').read()) + env['IPKGUSER'] = os.popen('id -un').read().strip() + env['IPKGGROUP'] = os.popen('id -gn').read().strip() env['IPKGFLAGS'] = SCons.Util.CLVar('-o $IPKGUSER -g $IPKGGROUP') env['IPKGSUFFIX'] = '.ipk' |