commit: 54d572cbc3ef2b646283b826813a47e5268bf734 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun May 31 21:15:29 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun May 31 21:15:29 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=54d572cb
Revert "Escape percent-signs in filename when fetching from mirrors" This probably breaks emirrordist; we will need separate methods for layout.get_path() when it is used client-side. This reverts commit 4c18f523bb86a8be4c148f365dabee06fca2e4fa. Bug: https://bugs.gentoo.org/719810 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> lib/portage/package/ebuild/fetch.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py index 47c3ad28f..28e7caf53 100644 --- a/lib/portage/package/ebuild/fetch.py +++ b/lib/portage/package/ebuild/fetch.py @@ -26,11 +26,6 @@ try: except ImportError: from urlparse import urlparse -try: - from urllib.parse import quote as urlquote -except ImportError: - from urllib import quote as urlquote - import portage portage.proxy.lazyimport.lazyimport(globals(), 'portage.package.ebuild.config:check_config_instance,config', @@ -356,7 +351,7 @@ _size_suffix_map = { class FlatLayout(object): def get_path(self, filename): - return urlquote(filename) + return filename def get_filenames(self, distdir): for dirpath, dirnames, filenames in os.walk(distdir, @@ -387,7 +382,7 @@ class FilenameHashLayout(object): c = c // 4 ret += fnhash[:c] + '/' fnhash = fnhash[c:] - return ret + urlquote(filename) + return ret + filename def get_filenames(self, distdir): pattern = ''
