| 1 |
commit: 099941cc4788f469b30b9ba7222f92fba28e6b28 |
| 2 |
Author: Alexander Berntsen <alexander <AT> plaimi <DOT> net> |
| 3 |
AuthorDate: Mon Feb 24 00:33:43 2014 +0000 |
| 4 |
Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 24 00:50:54 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=099941cc |
| 7 |
|
| 8 |
Handle bad PORTAGE_BINHOST gracefully (bug 502288) |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dbapi/bintree.py | 5 +++++ |
| 12 |
1 file changed, 5 insertions(+) |
| 13 |
|
| 14 |
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py |
| 15 |
index 022300e..7b61c1f 100644 |
| 16 |
--- a/pym/portage/dbapi/bintree.py |
| 17 |
+++ b/pym/portage/dbapi/bintree.py |
| 18 |
@@ -909,6 +909,11 @@ class binarytree(object): |
| 19 |
traceback.print_exc() |
| 20 |
|
| 21 |
raise |
| 22 |
+ except ValueError as _: |
| 23 |
+ writemsg("\n\n!!! Invalid PORTAGE_BINHOST value " |
| 24 |
+ "'%s'.\nSee man make.conf(5) for more info." |
| 25 |
+ "\n" % url.lstrip(), noiselevel=-1) |
| 26 |
+ exit(1) |
| 27 |
|
| 28 |
if f is None: |
Archives