summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-05-21 02:57:22 +0000
committerMike Frysinger <vapier@gentoo.org>2013-05-21 02:57:22 +0000
commit3843358ec3f3f4f40c7b5da49dbeb436e597c7ff (patch)
tree20374d5ee938e8fc27d0508bd63c6e3172b42ca1 /eclass/eutils.eclass
parentSet PYTHON_REQUIRED_USE, and add it to REQUIRED_USE in distutils-r1. (diff)
downloadgentoo-2-3843358ec3f3f4f40c7b5da49dbeb436e597c7ff.tar.gz
gentoo-2-3843358ec3f3f4f40c7b5da49dbeb436e597c7ff.tar.bz2
gentoo-2-3843358ec3f3f4f40c7b5da49dbeb436e597c7ff.zip
epatch: turn qa warning to hard failure w/relative paths in patches as people have had over 2 years to clean things up
Diffstat (limited to 'eclass/eutils.eclass')
-rw-r--r--eclass/eutils.eclass13
1 files changed, 9 insertions, 4 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 4f15742ad775..c8147313006d 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.418 2013/05/15 19:01:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.419 2013/05/21 02:57:22 vapier Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -476,9 +476,14 @@ epatch() {
# Similar reason, but with relative paths.
local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
if [[ -n ${rel_paths} ]] ; then
- eqawarn "QA Notice: Your patch uses relative paths '../'."
- eqawarn " In the future this will cause a failure."
- eqawarn "${rel_paths}"
+ echo
+ eerror "Rejected Patch: ${patchname} !"
+ eerror " ( ${PATCH_TARGET} )"
+ eerror
+ eerror "Your patch uses relative paths '../':"
+ eerror "${rel_paths}"
+ echo
+ die "you need to fix the relative paths in patch"
fi
# Dynamically detect the correct -p# ... i'm lazy, so shoot me :/