commit: 8b5f9678200964c3cbb2eb06b58ebfa138fbac45 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Jan 22 01:00:16 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Jan 22 01:11:35 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8b5f9678
emirrordist: prevent distfiles_db _pkg_str pickle problems When storing a cpv as a shelve value, convert _pkg_str to str in order to prevent pickle problems. Bug: https://bugs.gentoo.org/766459 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/_emirrordist/FetchTask.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/portage/_emirrordist/FetchTask.py b/lib/portage/_emirrordist/FetchTask.py index 41f96b962..997762082 100644 --- a/lib/portage/_emirrordist/FetchTask.py +++ b/lib/portage/_emirrordist/FetchTask.py @@ -44,7 +44,8 @@ class FetchTask(CompositeTask): if self.config.distfiles_db is not None and \ self.distfile not in self.config.distfiles_db: self._previously_added = False - self.config.distfiles_db[self.distfile] = self.cpv + # Convert _pkg_str to str in order to prevent pickle problems. + self.config.distfiles_db[self.distfile] = str(self.cpv) if not self._have_needed_digests(): msg = "incomplete digests: %s" % " ".join(self.digests)
