diff options
| author | Andreas Schneider <asn@samba.org> | 2019-06-03 10:40:55 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-06-05 15:40:23 +0000 |
| commit | aabdcc91513e242c4f191e1bbbb70c890416d213 (patch) | |
| tree | 7fe2a6d63a3e695031eeac56802f864df99c4b8e /third_party/waf/waflib/ConfigSet.py | |
| parent | 952437b1bdbe000c217836c4ecd59406e92146d7 (diff) | |
| download | samba-aabdcc91513e242c4f191e1bbbb70c890416d213.tar.gz | |
third_party: Update waf to version 2.0.17
This fixes building Samba, libtalloc, libtevent, libtdb and libldb with
Python 3.8.
wget https://waf.io/waf-2.0.17.tar.bz2
tar -xf waf-2.0.17.tar.bz2
git rm third_party/waf/waflib/ -r
mkdir third_party/waf -p
rsync -a waf-2.0.17/waflib/ third_party/waf/waflib/
git add third_party/waf/waflib/
(Then update version number in buildtools/bin/waf and
buildtools/wafsamba/wafsamba.py)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13960
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'third_party/waf/waflib/ConfigSet.py')
| -rw-r--r-- | third_party/waf/waflib/ConfigSet.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/waf/waflib/ConfigSet.py b/third_party/waf/waflib/ConfigSet.py index b300bb56b7c..901fba6c067 100644 --- a/third_party/waf/waflib/ConfigSet.py +++ b/third_party/waf/waflib/ConfigSet.py @@ -11,7 +11,7 @@ The values put in :py:class:`ConfigSet` must be serializable (dicts, lists, stri import copy, re, os from waflib import Logs, Utils -re_imp = re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) +re_imp = re.compile(r'^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) class ConfigSet(object): """ @@ -312,7 +312,7 @@ class ConfigSet(object): :type filename: string """ tbl = self.table - code = Utils.readf(filename, m='rU') + code = Utils.readf(filename, m='r') for m in re_imp.finditer(code): g = m.group tbl[g(2)] = eval(g(3)) |