From: fuzzyray <fuzzyray@gentoo.org>
Date: Wed, 6 May 2009 20:47:10 +0000 (-0000)
Subject: Revert EPREFIX patch commited in rev 610
X-Git-Tag: gentoolkit-0.3.0_rc6~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd11900a63d0d4b7975efb6dc59e046c932f3d65;p=gentoolkit.git

Revert EPREFIX patch commited in rev 610

svn path=/trunk/gentoolkit/; revision=614
---

diff --git a/ChangeLog b/ChangeLog
index 5c1c0c5..1116f96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,4 @@
-2009-05-06: Paul Varner <fuzzyray@gentoo.org>
-	* eclean: Add patch from MATSUI Tetsushi to have eclean take EPREFIX
-	into account for distfiles.exclude. (Bug 241600)
-
-2009-05-05: Paul Varner <fuzzyray@gentoo.org>
+2009-05-09: Paul Varner <fuzzyray@gentoo.org>
 	* equery: Added modular rewrite from djanderson
 	* gentoolkit: Added modular rewrite from djanderson
 	* All: converted to setup.py build system
diff --git a/bin/eclean b/bin/eclean
index a004388..5497cf3 100644
--- a/bin/eclean
+++ b/bin/eclean
@@ -802,8 +802,6 @@ def main():
 	# parse the exclusion file
 	if not 'exclude-file' in myoptions:
 		my_exclude_file = "/etc/%s/%s.exclude" % (__productname__ , myaction)
-		if 'EPREFIX' in os.environ:
-			my_exclude_file = os.environ['EPREFIX'] + my_exclude_file
 		if os.path.isfile(my_exclude_file):
 			myoptions['exclude-file'] = my_exclude_file
 	if 'exclude-file' in myoptions: