| 1 |
commit: 22e517a342ebf782fdb39afb4c7da23f6a9b4413 |
| 2 |
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 28 15:10:46 2019 +0000 |
| 4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 28 15:15:37 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=22e517a3 |
| 7 |
|
| 8 |
ebuild-writing/variables: fix the trailing slash in ROOT for EAPI7 |
| 9 |
|
| 10 |
Before EAPI7, ROOT was guaranteed to end with a trailing slash. EAPI7 |
| 11 |
reversed this. Add back trailing slashes to ROOT in the example. |
| 12 |
|
| 13 |
Reported-by: Conrad Kostecki <conrad <AT> kostecki.com> |
| 14 |
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org> |
| 15 |
|
| 16 |
ebuild-writing/variables/text.xml | 8 ++++---- |
| 17 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/ebuild-writing/variables/text.xml b/ebuild-writing/variables/text.xml |
| 20 |
index 35dc8f2..ffd2597 100644 |
| 21 |
--- a/ebuild-writing/variables/text.xml |
| 22 |
+++ b/ebuild-writing/variables/text.xml |
| 23 |
@@ -534,11 +534,11 @@ old and obsolete configuration file still exists: |
| 24 |
|
| 25 |
<codesample lang="ebuild"> |
| 26 |
pkg_postinst() { |
| 27 |
- if [[ -e "${ROOT}etc/oldconfig" ]]; then |
| 28 |
+ if [[ -e "${ROOT}/etc/oldconfig" ]]; then |
| 29 |
ewarn "You still have the obsolete config file " |
| 30 |
- ewarn " ${ROOT}etc/oldconfig." |
| 31 |
- ewarn "Please migrate your settings to ${ROOT}etc/newconfig" |
| 32 |
- ewarn "and remove ${ROOT}etc/oldconfig." |
| 33 |
+ ewarn " ${ROOT}/etc/oldconfig." |
| 34 |
+ ewarn "Please migrate your settings to ${ROOT}/etc/newconfig" |
| 35 |
+ ewarn "and remove ${ROOT}/etc/oldconfig." |
| 36 |
fi |
| 37 |
} |
| 38 |
</codesample> |
Archives