1 |
vapier 13/05/21 02:57:22 |
2 |
|
3 |
Modified: eutils.eclass |
4 |
Log: |
5 |
epatch: turn qa warning to hard failure w/relative paths in patches as people have had over 2 years to clean things up |
6 |
|
7 |
Revision Changes Path |
8 |
1.419 eclass/eutils.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.419&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.419&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.418&r2=1.419 |
13 |
|
14 |
Index: eutils.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v |
17 |
retrieving revision 1.418 |
18 |
retrieving revision 1.419 |
19 |
diff -u -r1.418 -r1.419 |
20 |
--- eutils.eclass 15 May 2013 19:01:36 -0000 1.418 |
21 |
+++ eutils.eclass 21 May 2013 02:57:22 -0000 1.419 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2013 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.418 2013/05/15 19:01:36 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.419 2013/05/21 02:57:22 vapier Exp $ |
27 |
|
28 |
# @ECLASS: eutils.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -476,9 +476,14 @@ |
31 |
# Similar reason, but with relative paths. |
32 |
local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}") |
33 |
if [[ -n ${rel_paths} ]] ; then |
34 |
- eqawarn "QA Notice: Your patch uses relative paths '../'." |
35 |
- eqawarn " In the future this will cause a failure." |
36 |
- eqawarn "${rel_paths}" |
37 |
+ echo |
38 |
+ eerror "Rejected Patch: ${patchname} !" |
39 |
+ eerror " ( ${PATCH_TARGET} )" |
40 |
+ eerror |
41 |
+ eerror "Your patch uses relative paths '../':" |
42 |
+ eerror "${rel_paths}" |
43 |
+ echo |
44 |
+ die "you need to fix the relative paths in patch" |
45 |
fi |
46 |
|
47 |
# Dynamically detect the correct -p# ... i'm lazy, so shoot me :/ |