Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
Odoo scripts
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
XCG
Odoo scripts
Commits
70d2f461f904
Commit
70d2f461f904
authored
7 years ago
by
Vincent Hatakeyama
Browse files
Options
Downloads
Patches
Plain Diff
do not set data dir if none provided
parent
cc63d3ead1c8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
VERSION
+1
-1
1 addition, 1 deletion
VERSION
do_tests
+1
-1
1 addition, 1 deletion
do_tests
docker_build
+1
-1
1 addition, 1 deletion
docker_build
run_tests
+1
-1
1 addition, 1 deletion
run_tests
setup.cfg
+1
-1
1 addition, 1 deletion
setup.cfg
start
+3
-14
3 additions, 14 deletions
start
with
8 additions
and
19 deletions
VERSION
+
1
−
1
View file @
70d2f461
2.1
1
2.1
2
This diff is collapsed.
Click to expand it.
do_tests
+
1
−
1
View file @
70d2f461
...
...
@@ -13,7 +13,7 @@
#
# - access to pg database
#
# Version 2.1
1
# Version 2.1
2
here
=
$(
dirname
$0
)
project_home
=
$(
cd
$here
&&
cd
..
&&
echo
$PWD
)
...
...
This diff is collapsed.
Click to expand it.
docker_build
+
1
−
1
View file @
70d2f461
...
...
@@ -3,7 +3,7 @@
# Create docker script
# template version 2.1
1
# template version 2.1
2
# TODO add a way to bypass the value, maybe with a key in the setup.cfg file
here
=
$(
dirname
$0
)
...
...
This diff is collapsed.
Click to expand it.
run_tests
+
1
−
1
View file @
70d2f461
...
...
@@ -5,7 +5,7 @@
#
# Either provide the name of the database (first argument) or it will default to <project>_test
# The DB user can be overriden by setting ODOO_SCRIPTS_DB_USER.
# Version 2.1
1
# Version 2.1
2
here
=
$(
dirname
$0
)
project_home
=
$(
cd
$here
&&
cd
..
&&
echo
$PWD
)
tested_modules
=
$(
python
-B
-c
"import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('
${
project_home
}
/setup.cfg') ; print ','.join(c.get('odoo_scripts', 'module_list_tests', '').split())"
)
...
...
This diff is collapsed.
Click to expand it.
setup.cfg
+
1
−
1
View file @
70d2f461
[bumpversion]
current_version
= 2.1
1
current_version
= 2.1
2
parse
= (?P<major>\d+)\.(?P<minor>\d+)
serialize
=
{major}.{minor}
...
...
This diff is collapsed.
Click to expand it.
start
+
3
−
14
View file @
70d2f461
...
...
@@ -5,7 +5,7 @@
#
# You can set ODOO_DATA_DIR and ODOO_DB_HOST if you want to avoid using the default value ($HOME/var/tmp and localhost)
#
# Version 2.1
1
# Version 2.1
2
here
=
$(
dirname
$0
)
project_home
=
$(
cd
$here
&&
cd
..
&&
echo
$PWD
)
python
=
"/usr/bin/env python"
...
...
@@ -79,17 +79,6 @@
#
args
=
$*
if
[
"
$ODOO_TYPE
"
=
"odoo8"
]
;
then
if
echo
$args
|
grep
-q
-e
"
\(
\|
^
\)
--data-dir"
;
then
data_dir
=
""
else
data_dir
=
" --data-dir=
$HOME
/var/tmp"
fi
else
data_dir
=
""
fi
if
echo
$args
|
grep
-q
-e
"
\(
\|
^
\)
--db_host"
;
then
db_host
=
""
...
...
@@ -127,5 +116,5 @@
#
echo
"INFO - Version:
$(
$odoo_bin
--version
)
"
echo
"DEBUG - command line is:
$odoo_bin
$config
$db_host
$data_dir
$addons_path
$args
"
$odoo_bin
$config
$db_host
$data_dir
$addons_path
$args
echo
"DEBUG - command line is:
$odoo_bin
$config
$db_host
$addons_path
$args
"
$odoo_bin
$config
$db_host
$addons_path
$args
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment