Add ipkg.py to the MANIFEST.in list and fix 1.5 fix

(string.split() instead of string methods).

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4194 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in
index e7c9bd81d148f73458e1b6f77b72a04e55f88d67..7f18726350fe728af1435330fc64db3c5b286194 100644 (file)
--- a/src/engine/MANIFEST.in
+++ b/src/engine/MANIFEST.in
@@ -108,6 +108,7 @@ SCons/Tool/ilink.py
 SCons/Tool/ilink32.py
 SCons/Tool/install.py
 SCons/Tool/intelc.py
+SCons/Tool/ipkg.py
 SCons/Tool/jar.py
 SCons/Tool/JavaCommon.py
 SCons/Tool/javac.py

diff --git a/src/engine/SCons/Tool/ipkg.py b/src/engine/SCons/Tool/ipkg.py
index 755c5367443df010a69600d0aa18477aacfe0ac2..10fbc98ed252e0b96030e0c58159286313b6a59e 100644 (file)
--- a/src/engine/SCons/Tool/ipkg.py
+++ b/src/engine/SCons/Tool/ipkg.py
@@ -35,9 +35,10 @@ packages fake_root.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import os
+import string
+
 import SCons.Builder
-from os import popen
-from os.path import dirname
 
 def generate(env):
     """Add Builders and construction variables for ipkg to an Environment."""
@@ -52,8 +53,11 @@ def generate(env):
 
     env['IPKG']       = 'ipkg-build'
     env['IPKGCOM']    = '$IPKG $IPKGFLAGS ${SOURCE}'
-    env['IPKGUSER']   = popen('id -un').read().strip()
-    env['IPKGGROUP']  = popen('id -gn').read().strip()
+    # 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['IPKGFLAGS']  = SCons.Util.CLVar('-o $IPKGUSER -g $IPKGGROUP')
     env['IPKGSUFFIX'] = '.ipk'