summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2012-10-06 21:52:34 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2012-10-06 21:52:34 (GMT)
commitf79ad697f90ac1bca6671682e7b3d8b292356733 (patch)
treef46369d70ad043a6146d72fd1e0ad139b0fc291a /src
parenta75755810b08c4d1f6bf7e28211f4a62872b35d8 (diff)
parentaf2b9e2f216459fcdc26f367aaaf528d8122283b (diff)
downloadSCons-f79ad697f90ac1bca6671682e7b3d8b292356733.zip
SCons-f79ad697f90ac1bca6671682e7b3d8b292356733.tar.gz
SCons-f79ad697f90ac1bca6671682e7b3d8b292356733.tar.bz2
Merged in dirkbaechle/scons (pull request #40): fix RPM tests to use new rpmutils
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Tool/xgettext.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/xgettext.py b/src/engine/SCons/Tool/xgettext.py
index 17e055f..64436b8 100644
--- a/src/engine/SCons/Tool/xgettext.py
+++ b/src/engine/SCons/Tool/xgettext.py
@@ -271,7 +271,10 @@ def generate(env,**kw):
import SCons.Util
from SCons.Tool.GettextCommon import RPaths, _detect_xgettext
- env['XGETTEXT'] = _detect_xgettext(env)
+ try:
+ env['XGETTEXT'] = _detect_xgettext(env)
+ except:
+ env['XGETTEXT'] = 'xgettext'
# NOTE: sources="$SOURCES" would work as well. However, we use following
# construction to convert absolute paths provided by scons onto paths
# relative to current working dir. Note, that scons expands $SOURCE(S) to