diff options
Diffstat (limited to 'src/engine/SCons/Tool/msgmerge.py')
| -rw-r--r-- | src/engine/SCons/Tool/msgmerge.py | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/msgmerge.py b/src/engine/SCons/Tool/msgmerge.py index c7ebd88..aef1f5f 100644 --- a/src/engine/SCons/Tool/msgmerge.py +++ b/src/engine/SCons/Tool/msgmerge.py @@ -3,7 +3,7 @@  Tool specific initialization for `msgmerge` tool.  """ -# Copyright (c) 2001 - 2016 The SCons Foundation +# Copyright (c) 2001 - 2017 The SCons Foundation  #   # Permission is hereby granted, free of charge, to any person obtaining  # a copy of this software and associated documentation files (the @@ -24,7 +24,7 @@ Tool specific initialization for `msgmerge` tool.  # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Tool/msgmerge.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" +__revision__ = "src/engine/SCons/Tool/msgmerge.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"  #############################################################################  def _update_or_init_po_files(target, source, env): @@ -58,7 +58,7 @@ def _POUpdateBuilderWrapper(env, target=None, source=_null, **kw):    if source is _null:      if 'POTDOMAIN' in kw:        domain = kw['POTDOMAIN'] -    elif env.has_key('POTDOMAIN') and env['POTDOMAIN']: +    elif 'POTDOMAIN' in env and env['POTDOMAIN']:        domain = env['POTDOMAIN']      else:        domain = 'messages'  | 
