| 1 |
Adjust the regular expression to avoid overly-greedy .+ groups, |
| 2 |
so that is will properly replace all occurrences, as necessary |
| 3 |
for the purposes of bug 713726 since PORTAGE_BINHOST may contain |
| 4 |
multiple values. |
| 5 |
|
| 6 |
Bug: https://bugs.gentoo.org/713726 |
| 7 |
Signed-off-by: Zac Medico <zmedico@g.o> |
| 8 |
--- |
| 9 |
lib/portage/package/ebuild/fetch.py | 2 +- |
| 10 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 |
|
| 12 |
diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py |
| 13 |
index f7984130f..28e7caf53 100644 |
| 14 |
--- a/lib/portage/package/ebuild/fetch.py |
| 15 |
+++ b/lib/portage/package/ebuild/fetch.py |
| 16 |
@@ -67,7 +67,7 @@ _userpriv_spawn_kwargs = ( |
| 17 |
) |
| 18 |
|
| 19 |
def _hide_url_passwd(url): |
| 20 |
- return re.sub(r'//(.+):.+@(.+)', r'//\1:*password*@\2', url) |
| 21 |
+ return re.sub(r'//([^:\s]+):[^@\s]+@', r'//\1:*password*@', url) |
| 22 |
|
| 23 |
|
| 24 |
def _want_userfetch(settings): |
| 25 |
-- |
| 26 |
2.24.1 |
Archives