Skip to content
Snippets Groups Projects
Commit aa3ef681ceeb authored by Vincent Hatakeyama's avatar Vincent Hatakeyama
Browse files

:art: pep8

parent 9c87994a3169
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
__version__ = '0.1.0' __version__ = '0.1.0'
__date__ = '2017-08-11' __date__ = '2017-08-11'
__updated__ = '2017-08-25' __updated__ = '2017-08-28'
# Check the version of the "docker" package # Check the version of the "docker" package
if docker.__version__.split('.') < [2]: if docker.__version__.split('.') < [2]:
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
else: else:
local_ip = None local_ip = None
try: try:
from netifaces import ifaddresses, AF_INET # apt python-netifaces from netifaces import ifaddresses, AF_INET # apt python-netifaces
ifaceName = 'docker0' ifaceName = 'docker0'
addresses = [i['addr'] for i in ifaddresses(ifaceName).setdefault(AF_INET, [{'addr':'No IP addr'}])] addresses = [i['addr'] for i in ifaddresses(ifaceName).setdefault(AF_INET, [{'addr':'No IP addr'}])]
if addresses: if addresses:
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
# auto detect local conf # auto detect local conf
local_conf_path = 'conf/dev/odoo.conf' local_conf_path = 'conf/dev/odoo.conf'
user = db_user user = db_user
password = db_password password = db_password
if os.path.isfile(local_conf_path): if os.path.isfile(local_conf_path):
logging.info('Local configuration file found: %s' % local_conf_path) logging.info('Local configuration file found: %s' % local_conf_path)
...@@ -320,7 +320,8 @@ ...@@ -320,7 +320,8 @@
# not injection safe but you are on your own machine # not injection safe but you are on your own machine
# with already full access to db # with already full access to db
cursor.execute( cursor.execute(
'CREATE ROLE %s LOGIN CREATEDB PASSWORD %%s' % user, (password, )) 'CREATE ROLE %s LOGIN CREATEDB PASSWORD %%s' % user,
(password,))
connection.commit() connection.commit()
connection.close() connection.close()
else: else:
...@@ -329,8 +330,9 @@ ...@@ -329,8 +330,9 @@
# volume magic # volume magic
for addons_dir in addon_dirs: for addons_dir in addon_dirs:
options.append('--volume') binds.append(
options.append('%s:/mnt/addons/%s' % (os.path.join(project_path, addons_dir), addons_dir)) '%s:/mnt/addons/%s' % (os.path.join(project_path, addons_dir),
addons_dir))
all_addons_dir = [ all_addons_dir = [
'/opt/odoo/sources/odoo/addons', '/opt/odoo/sources/odoo/addons',
] ]
...@@ -334,7 +336,8 @@ ...@@ -334,7 +336,8 @@
all_addons_dir = [ all_addons_dir = [
'/opt/odoo/sources/odoo/addons', '/opt/odoo/sources/odoo/addons',
] ]
all_addons_dir.extend('/mnt/addons/%s' % addons_dir for addons_dir in addon_dirs) all_addons_dir.extend(
'/mnt/addons/%s' % addons_dir for addons_dir in addon_dirs)
arg.append('--addons-path') arg.append('--addons-path')
arg.append(','.join(all_addons_dir)) arg.append(','.join(all_addons_dir))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment