summaryrefslogtreecommitdiff
path: root/src/engine/SCons/Tool/msgmerge.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2013-03-11 22:33:29 +0100
committerLuca Falavigna <dktrkranz@debian.org>2013-03-11 22:33:29 +0100
commite5a4f8c6dbf0dcfc74bfd8ba99099d9fe1064642 (patch)
treecf4f35e2a3b56525cf8c19a1b8fb3147d36f0229 /src/engine/SCons/Tool/msgmerge.py
parent2323daae4add07272c0f4feb9243c352a9ca4b18 (diff)
parentcb3425abe0bc2d05caf401ca24b82a25a81f009d (diff)
Merge tag 'upstream/2.3.0'
Upstream version 2.3.0
Diffstat (limited to 'src/engine/SCons/Tool/msgmerge.py')
-rw-r--r--src/engine/SCons/Tool/msgmerge.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/msgmerge.py b/src/engine/SCons/Tool/msgmerge.py
index 2bc89f4..35315f9 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
+__revision__ = "src/engine/SCons/Tool/msgmerge.py 2013/03/03 09:48:35 garyo"
#############################################################################
def _update_or_init_po_files(target, source, env):
@@ -70,7 +70,10 @@ def _POUpdateBuilderWrapper(env, target=None, source=_null, **kw):
def generate(env,**kw):
""" Generate the `xgettext` tool """
from SCons.Tool.GettextCommon import _detect_msgmerge
- env['MSGMERGE'] = _detect_msgmerge(env)
+ try:
+ env['MSGMERGE'] = _detect_msgmerge(env)
+ except:
+ env['MSGMERGE'] = 'msgmerge'
env.SetDefault(
POTSUFFIX = ['.pot'],
POSUFFIX = ['.po'],
@@ -88,7 +91,10 @@ def generate(env,**kw):
def exists(env):
""" Check if the tool exists """
from SCons.Tool.GettextCommon import _msgmerge_exists
- return _msgmerge_exists(env)
+ try:
+ return _msgmerge_exists(env)
+ except:
+ return False
#############################################################################
# Local Variables: