| 1 |
commit: 5a08a63420601a47075da957e25dbc909ce33aef |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 17 21:07:59 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 17 21:08:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a08a634 |
| 7 |
|
| 8 |
eclass/eutils.eclass: epatch_user: Strip subslot when taking patches from /etc/portage/patches/$CAT/$PN:$SLOT. Bug #574966. |
| 9 |
|
| 10 |
This makes it similar to what portage does with eapply_user. |
| 11 |
|
| 12 |
eclass/eutils.eclass | 2 +- |
| 13 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass |
| 16 |
index d23a5b7..0004c2c 100644 |
| 17 |
--- a/eclass/eutils.eclass |
| 18 |
+++ b/eclass/eutils.eclass |
| 19 |
@@ -1731,7 +1731,7 @@ epatch_user() { |
| 20 |
|
| 21 |
# don't clobber any EPATCH vars that the parent might want |
| 22 |
local EPATCH_SOURCE check |
| 23 |
- for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT}}; do |
| 24 |
+ for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT%/*}}; do |
| 25 |
EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CTARGET}/${check} |
| 26 |
[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check} |
| 27 |
[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check} |
Archives