| 1 |
commit: e14213a0eff6711e61225a95807e51ec329196cc |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 16 20:48:31 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 16 20:54:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14213a0 |
| 7 |
|
| 8 |
app-portage/esearch: 1.3-r3 for bug 670224 |
| 9 |
|
| 10 |
#670224 fix esearchdb.py quoting |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/670224 |
| 13 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 14 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
...esearch-1.3-r2.ebuild => esearch-1.3-r3.ebuild} | 5 +-- |
| 17 |
.../esearch/files/1.3-updatedb-quoting.patch | 39 ++++++++++++++++++++++ |
| 18 |
2 files changed, 42 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r3.ebuild |
| 21 |
similarity index 94% |
| 22 |
rename from app-portage/esearch/esearch-1.3-r2.ebuild |
| 23 |
rename to app-portage/esearch/esearch-1.3-r3.ebuild |
| 24 |
index 39ad2fc4e7f..026f4017bec 100644 |
| 25 |
--- a/app-portage/esearch/esearch-1.3-r2.ebuild |
| 26 |
+++ b/app-portage/esearch/esearch-1.3-r3.ebuild |
| 27 |
@@ -1,9 +1,9 @@ |
| 28 |
# Copyright 1999-2020 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
-EAPI=5 |
| 32 |
+EAPI=7 |
| 33 |
|
| 34 |
-PYTHON_COMPAT=(python{3_6,3_7}) |
| 35 |
+PYTHON_COMPAT=(python3_{6..9}) |
| 36 |
PYTHON_REQ_USE="readline(+)" |
| 37 |
|
| 38 |
inherit distutils-r1 |
| 39 |
@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}" |
| 40 |
PATCHES=( |
| 41 |
"${FILESDIR}"/${PV}-Fix-setup.py.patch |
| 42 |
"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch |
| 43 |
+ "${FILESDIR}"/${PV}-updatedb-quoting.patch |
| 44 |
) |
| 45 |
|
| 46 |
python_configure_all() { |
| 47 |
|
| 48 |
diff --git a/app-portage/esearch/files/1.3-updatedb-quoting.patch b/app-portage/esearch/files/1.3-updatedb-quoting.patch |
| 49 |
new file mode 100644 |
| 50 |
index 00000000000..4f20634e675 |
| 51 |
--- /dev/null |
| 52 |
+++ b/app-portage/esearch/files/1.3-updatedb-quoting.patch |
| 53 |
@@ -0,0 +1,39 @@ |
| 54 |
+From 8cbf59309a48327b74969bf402b415e389d79f73 Mon Sep 17 00:00:00 2001 |
| 55 |
+From: Zac Medico <zmedico@g.o> |
| 56 |
+Date: Sun, 16 Aug 2020 13:37:27 -0700 |
| 57 |
+Subject: [PATCH] updatedb: use repr for correct quoting (bug 670224) |
| 58 |
+ |
| 59 |
+Bug: https://bugs.gentoo.org/670224 |
| 60 |
+Signed-off-by: Zac Medico <zmedico@g.o> |
| 61 |
+--- |
| 62 |
+ esearch/update.py | 12 ++---------- |
| 63 |
+ 1 file changed, 2 insertions(+), 10 deletions(-) |
| 64 |
+ |
| 65 |
+diff --git a/esearch/update.py b/esearch/update.py |
| 66 |
+index f05d08f..b18070c 100755 |
| 67 |
+--- a/esearch/update.py |
| 68 |
++++ b/esearch/update.py |
| 69 |
+@@ -210,18 +210,10 @@ def updatedb(config=None): |
| 70 |
+ lastcat = curcat |
| 71 |
+ |
| 72 |
+ installed = pkg_version(VARTREE.dep_bestmatch(pkg)) |
| 73 |
+- if installed: |
| 74 |
+- installed = "\'%s\'" % installed |
| 75 |
+- else: |
| 76 |
+- installed = str(installed) |
| 77 |
+ |
| 78 |
+ dbfile.write( |
| 79 |
+- _unicode( |
| 80 |
+- "(\'%s\', \'%s\', %s" %(pkgname, pkg, str(masked)) + |
| 81 |
+- ", \'%s\', %s" % (pkg_version(pkgv), installed) + |
| 82 |
+- ", \'%s\', \'%s\', \'%s\', \'%s\'" |
| 83 |
+- % (filesize, homepage, description.replace("'", "\\'"), |
| 84 |
+- _license) + "),\n")) |
| 85 |
++ repr((pkgname, pkg, masked, pkg_version(pkgv), installed, |
| 86 |
++ filesize, homepage, description, _license)) + ",\n") |
| 87 |
+ |
| 88 |
+ except KeyboardInterrupt: |
| 89 |
+ dbfile.close() |
| 90 |
+-- |
| 91 |
+2.25.3 |
| 92 |
+ |
Archives