X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=odoo.py;h=b8f93ad19d58f5b05413d0590dd2fe40627ae41e;hb=9fb2f37eb95fc61661fb1b540fa1f1eebbd0e350;hp=a24396e422f9d99731060cb909ffcb199467e3a2;hpb=872842ff9e4e0861c365a3edf4d3b9d776553f85;p=odoo%2Fodoo.git

diff --git a/odoo.py b/odoo.py
index a24396e..b8f93ad 100755
--- a/odoo.py
+++ b/odoo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #----------------------------------------------------------
 # odoo cli
 #
@@ -68,11 +68,10 @@ def cmd_setup_git():
         git_dir = os.getcwd()
     if git_dir:
         # push sane config for git < 2.0, and hooks
-        run('git','config','push.default','simple')
+        #run('git','config','push.default','simple')
         # alias
         run('git','config','alias.st','status')
         # merge bzr style
-        run('git','config','merge.ff','no')
         run('git','config','merge.commit','no')
         # pull let me choose between merge or rebase only works in git > 2.0, use an alias for 1
         run('git','config','pull.ff','only')
@@ -118,9 +117,10 @@ def cmd_setup_git_review():
         run('git','config','--add','remote.odoo.fetch','+refs/pull/*:refs/remotes/odoo/pull/*')
 
 def setup_deps_debian(git_dir):
-    debian_control_path = os.path.join(git_dir, 'setup/debian/control')
+    debian_control_path = os.path.join(git_dir, 'debian/control')
     debian_control = open(debian_control_path).read()
     debs = re.findall('python-[0-9a-z]+',debian_control)
+    debs += ["postgresql"]
     proc = subprocess.Popen(['sudo','apt-get','install'] + debs, stdin=open('/dev/tty'))
     proc.communicate()