From c2abf2b8b4c85be111316f0dce2780a34409310b Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 21 Jul 2014 16:15:32 +0530 Subject: [PATCH] fix migrate3to4 --- bench/cli.py | 6 ++++-- bench/migrate3to4.py | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bench/cli.py b/bench/cli.py index 09fafda6..dce6202b 100644 --- a/bench/cli.py +++ b/bench/cli.py @@ -14,7 +14,6 @@ from .app import get_app as _get_app from .app import new_app as _new_app from .app import pull_all_apps from .config import generate_nginx_config, generate_supervisor_config -from .migrate3to4 import main as _migrate_3to4 import os import sys import logging @@ -109,7 +108,10 @@ def start(): @click.argument('path') def migrate_3to4(path): "Migrate from ERPNext v3.x" - _migrate_3to4(path) + exec_cmd("{python} {migrate_3to4} {site}".format( + python=os.path.join('env', 'bin', 'python'), + migrate_3to4=os.path.join(os.path.dirname(__file__), 'migrate3to4.py'), + site=path)) @click.command('set-nginx-port') @click.argument('site') diff --git a/bench/migrate3to4.py b/bench/migrate3to4.py index 6aa0b059..9c7e927e 100644 --- a/bench/migrate3to4.py +++ b/bench/migrate3to4.py @@ -66,3 +66,8 @@ def module_to_json(module_path, indent=None, keys=None): module = {x:getattr(module, x) for x in json_keys} return json.dumps(module, indent=indent) +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument('site') + args = parser.parse_args() + main(args.site)