Author: dmeyer
Date: Sat Oct 13 07:38:51 2007
New Revision: 2855

Log:
better plugin detection

Modified:
   trunk/base/src/distribution/build_py.py
   trunk/base/src/distribution/core.py

Modified: trunk/base/src/distribution/build_py.py
==============================================================================
--- trunk/base/src/distribution/build_py.py     (original)
+++ trunk/base/src/distribution/build_py.py     Sat Oct 13 07:38:51 2007
@@ -33,7 +33,7 @@
 
 
     def check_package (self, package, package_dir):
-        if package_dir.endswith('plugins'):
+        if package.endswith('plugins'):
             return None
         return distutils.command.build_py.build_py.check_package(self, 
package, package_dir)
 

Modified: trunk/base/src/distribution/core.py
==============================================================================
--- trunk/base/src/distribution/core.py (original)
+++ trunk/base/src/distribution/core.py Sat Oct 13 07:38:51 2007
@@ -412,8 +412,6 @@
         """
         Helper function to create 'packages' and 'package_dir'.
         """
-        if not '__init__.py' in files and not dirname.endswith('plugins'):
-            return
         for key, value in kwargs.get('plugins', {}).items():
             if dirname.startswith(value):
                 python_dirname = key + dirname[len(value):].replace('/', '.')
@@ -423,8 +421,9 @@
             # Anything under module/src/extensions/foo gets translated to 
             # kaa.module.foo.
             python_dirname = python_dirname.replace(".extensions.", ".")
-        kwargs['package_dir'][python_dirname] = dirname
-        kwargs['packages'].append(python_dirname)
+        if '__init__.py' in files or python_dirname.endswith('plugins'):
+            kwargs['package_dir'][python_dirname] = dirname
+            kwargs['packages'].append(python_dirname)
 
 
     if 'module' not in kwargs:

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to