commit: f9b8dc221898a3f7c2173cb062fcc91097cd4ab4 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Tue Jul 12 00:27:34 2022 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Tue Jul 12 00:36:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b8dc22
app-portage/gentoolkit: Bump to 0.6.1-r2 to fix eclean-pkg Patch includes two small fixes for running emaint fix binhost directly from imported modules. Closes: https://bugs.gentoo.org/857555 Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> .../files/gentoolkit-0.6.1-pkgindex.patch | 45 ++++++++++++++++++++++ ...-0.6.1-r1.ebuild => gentoolkit-0.6.1-r2.ebuild} | 1 + 2 files changed, 46 insertions(+) diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch new file mode 100644 index 000000000000..193eacc2db8b --- /dev/null +++ b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch @@ -0,0 +1,45 @@ +From bf3eb16e451fd1bdee8ef03a0d22e0040e033f19 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <dol...@gentoo.org> +Date: Sun, 10 Jul 2022 23:41:33 -0700 +Subject: [PATCH] eclean/pkgindex.py: Fix typo in function call + + File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line +60, in clean_pkgs_index + if self.get_emaint_binhost(): +AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did +you mean: '_get_emaint_binhost'? + +Also fix too many parameters in line 68 for the self.controller() call + +Bug: https://bugs.gentoo.org/857555 + +Signed-off-by: Brian Dolbec <dol...@gentoo.org> +--- + pym/gentoolkit/eclean/pkgindex.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pym/gentoolkit/eclean/pkgindex.py b/pym/gentoolkit/eclean/pkgindex.py +index d0878a1..7d6fade 100644 +--- a/pym/gentoolkit/eclean/pkgindex.py ++++ b/pym/gentoolkit/eclean/pkgindex.py +@@ -57,15 +57,15 @@ class PkgIndex: + statinfo = os.stat(file_) + size1 = statinfo.st_size + show_progress = not quiet +- if self.get_emaint_binhost(): ++ if self._get_emaint_binhost(): + self.taskmaster = TaskHandler(show_progress_bar=show_progress) + tasks = [self.binhost] + self.taskmaster.run_tasks(tasks) + else: + self.call_emaint() + statinfo = os.stat(file_) + clean_size = size1 - statinfo.st_size +- self.controller("\n", clean_size, "Packages Index", file_, "Index") ++ self.controller(clean_size, "Packages Index", file_, "Index") + return clean_size + + def call_emaint(self): +-- +libgit2 1.4.3 + diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild similarity index 97% rename from app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild rename to app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild index d176540989f7..ea872764365b 100644 --- a/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild @@ -31,6 +31,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/gentoolkit-0.6.1-data_files.patch" + "${FILESDIR}/gentoolkit-0.6.1-pkgindex.patch" ) distutils_enable_tests setup.py
