| 1 |
commit: 3de00842d69669a15adaf9e81b0007a7052da5d0 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 20 09:51:34 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 20 09:52:33 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3de00842 |
| 7 |
|
| 8 |
async_fetch_map: handle _parse_uri_map exception (bug 710130) |
| 9 |
|
| 10 |
If _parse_uri_map raises an exception then raise it to the |
| 11 |
caller via the returned future. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/710130 |
| 14 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
lib/portage/dbapi/porttree.py | 9 ++++++--- |
| 17 |
1 file changed, 6 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py |
| 20 |
index 4bb396a6c..08af17bcd 100644 |
| 21 |
--- a/lib/portage/dbapi/porttree.py |
| 22 |
+++ b/lib/portage/dbapi/porttree.py |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1998-2019 Gentoo Authors |
| 25 |
+# Copyright 1998-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
from __future__ import unicode_literals |
| 29 |
@@ -804,8 +804,11 @@ class portdbapi(dbapi): |
| 30 |
(mypkg, eapi))) |
| 31 |
return |
| 32 |
|
| 33 |
- result.set_result(_parse_uri_map(mypkg, |
| 34 |
- {'EAPI':eapi,'SRC_URI':myuris}, use=useflags)) |
| 35 |
+ try: |
| 36 |
+ result.set_result(_parse_uri_map(mypkg, |
| 37 |
+ {'EAPI':eapi,'SRC_URI':myuris}, use=useflags)) |
| 38 |
+ except Exception as e: |
| 39 |
+ result.set_exception(e) |
| 40 |
|
| 41 |
aux_get_future = self.async_aux_get( |
| 42 |
mypkg, ["EAPI", "SRC_URI"], mytree=mytree, loop=loop) |
Archives