[jhbuild] Package: Fix _clean_la_files to look for config in the right place



commit 40299bedf8f74afbda5134605fe3805edf8c75f7
Author: Colin Walters <walters verbum org>
Date:   Tue Aug 9 08:46:13 2011 -0400

    Package: Fix _clean_la_files to look for config in the right place
    
    Config is currently hooked off of BuildScript - not sure why this
    worked for some modules but not others before.

 jhbuild/modtypes/__init__.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index 63a9b5c..4ee63d3 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -179,12 +179,12 @@ class Package:
         os.makedirs(destdir)
         return destdir
 
-    def _clean_la_files(self, installroot):
+    def _clean_la_files(self, buildscript, installroot):
         """This method removes .la files from the toplevel lib*/
         directories.  See bug 654013."""
         assert os.path.isabs(installroot)
-        assert os.path.isabs(self.config.prefix)
-        prefixdir = os.path.join(installroot, self.config.prefix[1:])
+        assert os.path.isabs(buildscript.config.prefix)
+        prefixdir = os.path.join(installroot, buildscript.config.prefix[1:])
         if os.path.isdir(prefixdir):
             for name in os.listdir(prefixdir):
                 namepath = os.path.join(prefixdir, name)
@@ -232,7 +232,7 @@ them into the prefix."""
     def process_install(self, buildscript, revision):
         assert self.supports_install_destdir
         destdir = self._get_destdir(buildscript)
-        self._clean_la_files(destdir)
+        self._clean_la_files(buildscript, destdir)
 
         stripped_prefix = buildscript.config.prefix[1:]
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]