FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed the accidental data sharing introduced by the previous patches

This commit is contained in:
Thomas Nagy 2014-09-28 21:32:59 +02:00
parent 8fc4aacb7f
commit a3942d386b
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
waflib/Tools/intltool.py
View File

@ -97,10 +97,10 @@ def apply_intltool_in_f(self):
cache = getattr(self, 'intlcache', '.intlcache')
self.env.INTLCACHE = [os.path.join(str(self.path.get_bld()), podir, cache)]
self.env.INTLPODIR = podirnode.bldpath()
self.env.INTLFLAGS = getattr(self, 'flags', self.env.INTLFLAGS_DEFAULT)
self.env.append_value('INTLFLAGS', getattr(self, 'flags', self.env.INTLFLAGS_DEFAULT))
if '-c' in self.env.INTLFLAGS:
Logs.warn('Redundant -c flag in intltool task %r' % self)
self.env.INTLFLAGS.remove('-c')
self.bld.fatal('Redundant -c flag in intltool task %r' % self)
style = getattr(self, 'style', None)
if style:
@ -109,8 +109,7 @@ def apply_intltool_in_f(self):
except KeyError:
self.bld.fatal('intltool_in style "%s" is not valid' % style)
if style_flag not in self.env.INTLFLAGS:
self.env.append_value('INTLFLAGS', [style_flag])
self.env.append_unique('INTLFLAGS', [style_flag])
for i in self.to_list(self.source):
node = self.path.find_resource(i)