Revert EPREFIX patch commited in rev 610

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

diff --git a/ChangeLog b/ChangeLog
index 5c1c0c5c3f3d3c2505e6230c79f96a176b80b524..1116f961d5be5ad58891820ac69f66c300192f76 100644 (file)
--- 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 a0043883dd1aaa0a34299bc707d4b30ab80b0392..5497cf39cd3d061ea10c9b18af7fa3c818cb5fcf 100644 (file)
--- 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: