1 |
commit: 72ed653257aaf394555b2d0b85e74b5a7481212f |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 26 20:02:28 2020 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 26 20:02:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ed6532 |
7 |
|
8 |
dev-ada/libadalang: fix usage of pyyaml load |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
12 |
|
13 |
dev-ada/libadalang/files/libadalang-2019-pyyaml.patch | 11 +++++++++++ |
14 |
dev-ada/libadalang/libadalang-2018-r2.ebuild | 1 + |
15 |
dev-ada/libadalang/libadalang-2019-r1.ebuild | 5 ++++- |
16 |
3 files changed, 16 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/dev-ada/libadalang/files/libadalang-2019-pyyaml.patch b/dev-ada/libadalang/files/libadalang-2019-pyyaml.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..ad78d5af1f3 |
21 |
--- /dev/null |
22 |
+++ b/dev-ada/libadalang/files/libadalang-2019-pyyaml.patch |
23 |
@@ -0,0 +1,11 @@ |
24 |
+--- a/ada/testsuite/testsuite_support/polyfill.py 2020-03-26 20:52:45.678476467 +0100 |
25 |
++++ b/ada/testsuite/testsuite_support/polyfill.py 2020-03-26 20:53:13.612979979 +0100 |
26 |
+@@ -368,7 +368,7 @@ |
27 |
+ # First load data provided by this testcase |
28 |
+ try: |
29 |
+ with open(os.path.join(test_dir, 'test.yaml'), 'r') as f: |
30 |
+- test_data = yaml.load(f) |
31 |
++ test_data = yaml.safe_load(f) |
32 |
+ except (IOError, yaml.error.YAMLError) as exc: |
33 |
+ status = 'PROBLEM' |
34 |
+ message = 'Invalid test.yaml: {}'.format(exc) |
35 |
|
36 |
diff --git a/dev-ada/libadalang/libadalang-2018-r2.ebuild b/dev-ada/libadalang/libadalang-2018-r2.ebuild |
37 |
index bbb04ac9fc4..976d27263cc 100644 |
38 |
--- a/dev-ada/libadalang/libadalang-2018-r2.ebuild |
39 |
+++ b/dev-ada/libadalang/libadalang-2018-r2.ebuild |
40 |
@@ -39,6 +39,7 @@ pkg_setup() { |
41 |
PATCHES=( |
42 |
"${FILESDIR}"/${P}-gentoo.patch |
43 |
"${FILESDIR}"/${PN}-2017-gentoo.patch |
44 |
+ "${FILESDIR}"/${PN}-2019-pyyaml.patch |
45 |
) |
46 |
|
47 |
src_configure() { |
48 |
|
49 |
diff --git a/dev-ada/libadalang/libadalang-2019-r1.ebuild b/dev-ada/libadalang/libadalang-2019-r1.ebuild |
50 |
index 2d2c39e9b8d..7acb3a03a87 100644 |
51 |
--- a/dev-ada/libadalang/libadalang-2019-r1.ebuild |
52 |
+++ b/dev-ada/libadalang/libadalang-2019-r1.ebuild |
53 |
@@ -37,7 +37,10 @@ pkg_setup() { |
54 |
ada_pkg_setup |
55 |
} |
56 |
|
57 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
58 |
+PATCHES=( |
59 |
+ "${FILESDIR}"/${P}-gentoo.patch |
60 |
+ "${FILESDIR}"/${P}-pyyaml.patch |
61 |
+) |
62 |
|
63 |
src_configure() { |
64 |
ada/manage.py -v debug generate || die |