diff options
| author | Alexander Bokovoy <ab@samba.org> | 2018-01-31 11:48:43 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-05 06:37:22 +0200 |
| commit | 4e65b33c1d40bb2c243f775f388056aed31d8671 (patch) | |
| tree | 5a41b6ddef7ce1c0b6a93bcc16ef89da10f080e8 /third_party/waf/waflib/extras/stracedeps.py | |
| parent | faef27506977db01cc4619140a71652463914378 (diff) | |
| download | samba-4e65b33c1d40bb2c243f775f388056aed31d8671.tar.gz | |
third_party:waf: update to upstream 2.0.4 release
Update third_party/waf/ to 2.0.4 to bring us closer to Python 3
This change requires a number of changes in buildtools/ too.
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'third_party/waf/waflib/extras/stracedeps.py')
| -rw-r--r-- | third_party/waf/waflib/extras/stracedeps.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/third_party/waf/waflib/extras/stracedeps.py b/third_party/waf/waflib/extras/stracedeps.py index f9581a9e908..4be44248cb6 100644 --- a/third_party/waf/waflib/extras/stracedeps.py +++ b/third_party/waf/waflib/extras/stracedeps.py @@ -1,3 +1,7 @@ +#! /usr/bin/env python +# encoding: utf-8 +# WARNING! Do not edit! https://waf.io/book/index.html#_obtaining_the_waf_file + #!/usr/bin/env python # encoding: utf-8 # Thomas Nagy, 2015 (ita) @@ -66,11 +70,8 @@ def get_strace_args(self): @task_method def exec_command(self, cmd, **kw): bld = self.generator.bld - try: - if not kw.get('cwd', None): - kw['cwd'] = bld.cwd - except AttributeError: - bld.cwd = kw['cwd'] = bld.variant_dir + if not 'cwd' in kw: + kw['cwd'] = self.get_cwd() args = self.get_strace_args() fname = self.get_strace_file() @@ -103,6 +104,9 @@ def parse_strace_deps(self, path, cwd): except OSError: pass + if not isinstance(cwd, str): + cwd = cwd.abspath() + nodes = [] bld = self.generator.bld try: @@ -114,7 +118,7 @@ def parse_strace_deps(self, path, cwd): pid_to_cwd = {} global BANNED - done = set([]) + done = set() for m in re.finditer(re_lines, cnt): # scraping the output of strace pid = m.group('pid') @@ -162,7 +166,7 @@ def parse_strace_deps(self, path, cwd): # record the dependencies then force the task signature recalculation for next time if Logs.verbose: - Logs.debug('deps: real scanner for %s returned %s' % (str(self), str(nodes))) + Logs.debug('deps: real scanner for %r returned %r', self, nodes) bld = self.generator.bld bld.node_deps[self.uid()] = nodes bld.raw_deps[self.uid()] = [] @@ -171,3 +175,4 @@ def parse_strace_deps(self, path, cwd): except AttributeError: pass self.signature() + |