summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2013-11-03 18:17:58 (GMT)
committerDirk Baechle <dl9obn@darc.de>2013-11-03 18:17:58 (GMT)
commit703ba43b17517810162d91b109b54fc76868eee6 (patch)
tree6c4aaaf1971124a8862d4dcf4d0346b5c70ee5df /src
parent396cc5ff8cce251f405e3eba6163362239ce7d08 (diff)
downloadSCons-703ba43b17517810162d91b109b54fc76868eee6.zip
SCons-703ba43b17517810162d91b109b54fc76868eee6.tar.gz
SCons-703ba43b17517810162d91b109b54fc76868eee6.tar.bz2
- corrected LC_ALL setting for RPM packaging
- now skipping several Docbook tests, when required stylesheets aren't installed
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Tool/rpm.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/rpm.py b/src/engine/SCons/Tool/rpm.py
index 26d2109..1f6eafe 100644
--- a/src/engine/SCons/Tool/rpm.py
+++ b/src/engine/SCons/Tool/rpm.py
@@ -79,7 +79,7 @@ def build_rpm(target, source, env):
errstr=output,
filename=str(target[0]) )
else:
- # XXX: assume that LC_ALL=c is set while running rpmbuild
+ # XXX: assume that LC_ALL=C is set while running rpmbuild
output_files = re.compile( 'Wrote: (.*)' ).findall( output )
for output, input in zip( output_files, target ):
@@ -117,7 +117,7 @@ def generate(env):
bld = RpmBuilder
env['BUILDERS']['Rpm'] = bld
- env.SetDefault(RPM = 'LC_ALL=c rpmbuild')
+ env.SetDefault(RPM = 'LC_ALL=C rpmbuild')
env.SetDefault(RPMFLAGS = SCons.Util.CLVar('-ta'))
env.SetDefault(RPMCOM = rpmAction)
env.SetDefault(RPMSUFFIX = '.rpm')