[ADD]:suppot for __openerp__.py or __terp__.py

bzr revid: rvo@tinyerp.co.in-20100311084941-1l92enpyz1a98hrr

1 files changed, 6 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 9d7a735d2f6..bc2d8b64d3f 100755
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ def check_modules():
 
 def find_addons():
     for root, _, names in os.walk(join('bin', 'addons')):
-        if '__terp__.py' in names:
+        if '__openerp__.py' or '__terp__.py' in names:
             yield basename(root), root
     #look for extra modules
     try:
@@ -86,7 +86,11 @@ def find_addons():
             mname = mname.strip()
             if not mname:
                 continue
-            if os.path.exists(join(empath, mname, '__terp__.py')):
+            terp = join(empath, mname, '__openerp__.py')
+            if not os.path.exists(terp):
+                terp = join(empath, mname, '__terp__.py')
+
+            if os.path.exists(terp):
                 yield mname, join(empath, mname)
             else:
                 print "Module %s specified, but no valid path." % mname