| 1 |
commit: 35b59df9c14228d1be3989516dedd51ea4bafbad |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 11 06:39:35 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 11 06:40:31 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b59df9 |
| 7 |
|
| 8 |
dev-lang/python-exec: Fix missing slashes |
| 9 |
|
| 10 |
Reported-by: Tim Harder <radhermit <AT> gentoo.org> |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/python-exec/python-exec-2.4.6-r1.ebuild | 12 ++++++------ |
| 14 |
dev-lang/python-exec/python-exec-9999.ebuild | 12 ++++++------ |
| 15 |
2 files changed, 12 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild |
| 18 |
index b40c64f6530..caee841df07 100644 |
| 19 |
--- a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild |
| 20 |
+++ b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild |
| 21 |
@@ -61,14 +61,14 @@ src_install() { |
| 22 |
} |
| 23 |
|
| 24 |
pkg_preinst() { |
| 25 |
- if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then |
| 26 |
+ if [[ -e ${EROOT}/etc/python-exec/python-exec.conf ]]; then |
| 27 |
# preserve current configuration |
| 28 |
- cp "${EROOT}"etc/python-exec/python-exec.conf \ |
| 29 |
- "${ED}"etc/python-exec/python-exec.conf || die |
| 30 |
+ cp "${EROOT}"/etc/python-exec/python-exec.conf \ |
| 31 |
+ "${ED}"/etc/python-exec/python-exec.conf || die |
| 32 |
else |
| 33 |
# preserve previous Python version preference |
| 34 |
local py old_pythons=() |
| 35 |
- local config_base=${EROOT}etc/env.d/python |
| 36 |
+ local config_base=${EROOT}/etc/env.d/python |
| 37 |
|
| 38 |
# start with the 'global' preference (2 vs 3) |
| 39 |
if [[ -f ${config_base}/config ]]; then |
| 40 |
@@ -115,14 +115,14 @@ pkg_preinst() { |
| 41 |
elog "you may want to modify the preference list yourself. In order to do so," |
| 42 |
elog "open the following file in your favorite editor:" |
| 43 |
elog |
| 44 |
- elog " ${EROOT}etc/python-exec/python-exec.conf" |
| 45 |
+ elog " ${EROOT}/etc/python-exec/python-exec.conf" |
| 46 |
elog |
| 47 |
elog "For more information on the new configuration format, please read" |
| 48 |
elog "the comment on top of the installed configuration file." |
| 49 |
|
| 50 |
local IFS=$'\n' |
| 51 |
echo "${old_pythons[*]}" \ |
| 52 |
- >> "${ED}"etc/python-exec/python-exec.conf || die |
| 53 |
+ >> "${ED}"/etc/python-exec/python-exec.conf || die |
| 54 |
fi |
| 55 |
fi |
| 56 |
} |
| 57 |
|
| 58 |
diff --git a/dev-lang/python-exec/python-exec-9999.ebuild b/dev-lang/python-exec/python-exec-9999.ebuild |
| 59 |
index 95c958dd98e..f5c7a17a180 100644 |
| 60 |
--- a/dev-lang/python-exec/python-exec-9999.ebuild |
| 61 |
+++ b/dev-lang/python-exec/python-exec-9999.ebuild |
| 62 |
@@ -67,14 +67,14 @@ src_install() { |
| 63 |
} |
| 64 |
|
| 65 |
pkg_preinst() { |
| 66 |
- if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then |
| 67 |
+ if [[ -e ${EROOT}/etc/python-exec/python-exec.conf ]]; then |
| 68 |
# preserve current configuration |
| 69 |
- cp "${EROOT}"etc/python-exec/python-exec.conf \ |
| 70 |
- "${ED}"etc/python-exec/python-exec.conf || die |
| 71 |
+ cp "${EROOT}"/etc/python-exec/python-exec.conf \ |
| 72 |
+ "${ED}"/etc/python-exec/python-exec.conf || die |
| 73 |
else |
| 74 |
# preserve previous Python version preference |
| 75 |
local py old_pythons=() |
| 76 |
- local config_base=${EROOT}etc/env.d/python |
| 77 |
+ local config_base=${EROOT}/etc/env.d/python |
| 78 |
|
| 79 |
# start with the 'global' preference (2 vs 3) |
| 80 |
if [[ -f ${config_base}/config ]]; then |
| 81 |
@@ -121,14 +121,14 @@ pkg_preinst() { |
| 82 |
elog "you may want to modify the preference list yourself. In order to do so," |
| 83 |
elog "open the following file in your favorite editor:" |
| 84 |
elog |
| 85 |
- elog " ${EROOT}etc/python-exec/python-exec.conf" |
| 86 |
+ elog " ${EROOT}/etc/python-exec/python-exec.conf" |
| 87 |
elog |
| 88 |
elog "For more information on the new configuration format, please read" |
| 89 |
elog "the comment on top of the installed configuration file." |
| 90 |
|
| 91 |
local IFS=$'\n' |
| 92 |
echo "${old_pythons[*]}" \ |
| 93 |
- >> "${ED}"etc/python-exec/python-exec.conf || die |
| 94 |
+ >> "${ED}"/etc/python-exec/python-exec.conf || die |
| 95 |
fi |
| 96 |
fi |
| 97 |
} |
Archives