diff options
author | Dirk Baechle <dl9obn@darc.de> | 2013-11-03 19:17:58 +0100 |
---|---|---|
committer | Dirk Baechle <dl9obn@darc.de> | 2013-11-03 19:17:58 +0100 |
commit | 8e5dddb4931ceba8da3d459a8e964a73a31e58db (patch) | |
tree | 6c4aaaf1971124a8862d4dcf4d0346b5c70ee5df /src/engine | |
parent | e1766ee40c7c01fb3d49b51c55105e4366d2ba5c (diff) | |
download | scons-8e5dddb4931ceba8da3d459a8e964a73a31e58db.tar.gz |
- corrected LC_ALL setting for RPM packaging
- now skipping several Docbook tests, when required stylesheets aren't installed
Diffstat (limited to 'src/engine')
-rw-r--r-- | src/engine/SCons/Tool/rpm.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/rpm.py b/src/engine/SCons/Tool/rpm.py index 26d21099..1f6eafe0 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') |