diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2014-04-26 11:52:25 +0200 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2014-04-26 11:52:25 +0200 |
| commit | c58ef47cac0ffa49ecabdb228991a89fcdb4f8ef (patch) | |
| tree | 677bf40bab72549a4c2dd882328a9896d1a08a87 /engine/SCons/Tool/rpm.py | |
| parent | d4746a568b9d1464742de0788d39b08309e28cb0 (diff) | |
| parent | 599d55e3999ad29f72fdc3a61d7c4bafc3171452 (diff) | |
Merge tag 'upstream/2.3.1'
Upstream version 2.3.1
Diffstat (limited to 'engine/SCons/Tool/rpm.py')
| -rw-r--r-- | engine/SCons/Tool/rpm.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/SCons/Tool/rpm.py b/engine/SCons/Tool/rpm.py index ef31bd5..9be0d79 100644 --- a/engine/SCons/Tool/rpm.py +++ b/engine/SCons/Tool/rpm.py @@ -11,7 +11,7 @@ tar.gz consisting of the source file and a specfile. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -33,7 +33,7 @@ tar.gz consisting of the source file and a specfile. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/rpm.py 2013/03/03 09:48:35 garyo" +__revision__ = "src/engine/SCons/Tool/rpm.py 2014/03/02 14:18:15 garyo" import os import re @@ -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') |