Revert EPREFIX patch commited in rev 610

svn path=/branches/gentoolkit-0.2.4/; revision=614

diff --git a/ChangeLog b/ChangeLog
index d9395853c62156c53b631423ef94bfa409bb080f..65978801a9a3f9d181c806a523c15c990583da25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-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-04-30: Paul Varner <fuzzyray@gentoo.org>
        * revdep-rebuild: Add patch from loki_val to check -l dependencies in 
        .la files (Bug #267898)

diff --git a/src/eclean/eclean b/src/eclean/eclean
index 423fc88783b96042146e100b3e42f6a58787824d..55cc2a74b736ee629090a977684853381648424d 100644 (file)
--- a/src/eclean/eclean
+++ b/src/eclean/eclean
@@ -806,8 +806,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: