[FIX] web_kanban: fixed issues when having no column to display in kanban

[odoo/odoo.git] / odoo.py

diff --git a/odoo.py b/odoo.py
index ba4178f..e5f861b 100755 (executable)
--- a/odoo.py
+++ b/odoo.py
@@ -47,14 +47,14 @@ def git_locate():
         os.chdir('odoo')
 
     path = os.getcwd()
-    while path != '/':
+    while path != os.path.abspath(os.sep):
         gitconfig_path = os.path.join(path, '.git/config')
         if os.path.isfile(gitconfig_path):
             release_py = os.path.join(path, 'openerp/release.py')
             if os.path.isfile(release_py):
                 break
         path = os.path.dirname(path)
-    if path == '/':
+    if path == os.path.abspath(os.sep):
         path = None
     return path
 
@@ -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()