diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:08 +0200 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:08 +0200 | 
| commit | 9c04223086bf606eaac6dc2848af80518210d823 (patch) | |
| tree | e455703d75ac36f88d95cb712f5ea3bc4fc0d96e /engine/SCons/Tool/ipkg.py | |
| parent | 19712e5025e3cf6a33fccd0738f04e018d55025f (diff) | |
New upstream version 3.1.0upstream/3.1.0
Diffstat (limited to 'engine/SCons/Tool/ipkg.py')
| -rw-r--r-- | engine/SCons/Tool/ipkg.py | 8 | 
1 files changed, 5 insertions, 3 deletions
diff --git a/engine/SCons/Tool/ipkg.py b/engine/SCons/Tool/ipkg.py index 0027781..664c3a6 100644 --- a/engine/SCons/Tool/ipkg.py +++ b/engine/SCons/Tool/ipkg.py @@ -33,7 +33,7 @@ packages fake_root.  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  # -__revision__ = "src/engine/SCons/Tool/ipkg.py a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan" +__revision__ = "src/engine/SCons/Tool/ipkg.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"  import os @@ -55,8 +55,10 @@ def generate(env):      env['IPKGCOM'] = '$IPKG $IPKGFLAGS ${SOURCE}'      if env.WhereIs('id'): -        env['IPKGUSER'] = os.popen('id -un').read().strip() -        env['IPKGGROUP'] = os.popen('id -gn').read().strip() +        with os.popen('id -un') as p: +            env['IPKGUSER'] = p.read().strip() +        with os.popen('id -gn') as p: +            env['IPKGGROUP'] = p.read().strip()      env['IPKGFLAGS'] = SCons.Util.CLVar('-o $IPKGUSER -g $IPKGGROUP')      env['IPKGSUFFIX'] = '.ipk'  | 
