diff options
Diffstat (limited to 'src/engine/SCons/Tool/ipkg.py')
| -rw-r--r-- | src/engine/SCons/Tool/ipkg.py | 10 | 
1 files changed, 6 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/ipkg.py b/src/engine/SCons/Tool/ipkg.py index 4ad53c9..664c3a6 100644 --- a/src/engine/SCons/Tool/ipkg.py +++ b/src/engine/SCons/Tool/ipkg.py @@ -11,7 +11,7 @@ packages fake_root.  """  # -# Copyright (c) 2001 - 2017 The SCons Foundation +# Copyright (c) 2001 - 2019 The SCons Foundation  #  # Permission is hereby granted, free of charge, to any person obtaining  # a copy of this software and associated documentation files (the @@ -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 rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__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'  | 
