Merge lp:~anybox/anybox.recipe.openerp/fix_standalone_for_5.0_module into lp:anybox.recipe.openerp

[Jean-Sébastien SUZANNE]

In OPenERP 5.0 the manifest are __terp__.py not __openerp__.py

[Georges Racinet (gracinet)]

Indeed, I had done the init part earlier, and forgotten about the update…

review: Approve

=== modified file 'anybox/recipe/openerp/vcs/base.py'
--- anybox/recipe/openerp/vcs/base.py	2013-07-26 13:25:12 +0000
+++ anybox/recipe/openerp/vcs/base.py	2013-08-12 11:44:56 +0000
@@ -101,7 +101,10 @@
             name = os.path.split(target_dir)[-1]
             new_target = os.path.join(target_dir, name)
             manifest = os.path.join(new_target, '__openerp__.py')
-            if cls.is_versioned(new_target) and os.path.exists(manifest):
+            manifest2 = os.path.join(new_target, '__terp__.py')
+	    exists = os.path.exists(manifest)
+	    exists = exists or os.path.exists(manifest2)
+            if cls.is_versioned(new_target) and exists:
                 return new_target
         return target_dir