From e4adb72dc45d5a978a9e7983c1e96f7dcde2da32 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 3 Oct 2013 19:32:09 +0530 Subject: [PATCH 1/2] [minor] wnf run all patches --- wnf.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/wnf.py b/wnf.py index cab65c46dd..e82b4d2190 100755 --- a/wnf.py +++ b/wnf.py @@ -66,7 +66,7 @@ def setup_parser(): # common parser.add_argument("-f", "--force", default=False, action="store_true", help="Force execution where applicable (look for [-f] in help)") - parser.add_argument("-v", "--verbose", default=False, action="store_true", + parser.add_argument("--quiet", default=True, action="store_false", dest="verbose", help="Show verbose output where applicable") parser.add_argument("--site", nargs="?", metavar="SITE-NAME or all", help="Run for a particular site") @@ -187,18 +187,18 @@ def setup_translation(parser): # install @cmd -def install(db_name, site=None, verbose=False, force=False, root_password=None): +def install(db_name, site=None, verbose=True, force=False, root_password=None): from webnotes.install_lib.install import Installer inst = Installer('root', db_name=db_name, site=site, root_password=root_password) inst.install(db_name, verbose=verbose, force=force) @cmd -def reinstall(site=None, verbose=0): +def reinstall(site=None, verbose=True): webnotes.init(site=site) install(webnotes.conf.db_name, site=site, verbose=verbose, force=True) @cmd -def restore(db_name, source_sql, site=None, verbose=0, force=False): +def restore(db_name, source_sql, site=None, verbose=True, force=False): install(db_name, source_sql, site=site, verbose=verbose, force=force) @cmd @@ -236,15 +236,18 @@ def latest(site=None, verbose=True): import webnotes.model.sync webnotes.connect(site=site) + try: + # run patches + webnotes.modules.patch_handler.log_list = [] + webnotes.modules.patch_handler.run_all() + if verbose: + print "\n".join(webnotes.modules.patch_handler.log_list) - # run patches - webnotes.modules.patch_handler.log_list = [] - webnotes.modules.patch_handler.run_all() - if verbose: + # sync + webnotes.model.sync.sync_all() + except webnotes.modules.patch_handler.PatchError, e: print "\n".join(webnotes.modules.patch_handler.log_list) - - # sync - webnotes.model.sync.sync_all() + raise e @cmd def sync_all(site=None, force=False): From 2983741cf2ba20418ba0d850d774ff6a01239520 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 4 Oct 2013 13:20:53 +0530 Subject: [PATCH 2/2] [minor] [fix] query report and wnf --- webnotes/widgets/query_report.py | 4 ++-- wnf.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/webnotes/widgets/query_report.py b/webnotes/widgets/query_report.py index 7a6b9d9e38..1645d3b7af 100644 --- a/webnotes/widgets/query_report.py +++ b/webnotes/widgets/query_report.py @@ -120,8 +120,8 @@ def get_user_match_filters(doctypes, ref_doctype): tables.append("`tab" + dt + "`") doctypes_meta[dt] = webnotes.model.doctype.get(dt) - webnotes.widgets.reportview.tables = tables - webnotes.widgets.reportview.doctypes = doctypes_meta + webnotes.local.reportview_tables = tables + webnotes.local.reportview_doctypes = doctypes_meta for dt in doctypes: match_filters.update(webnotes.widgets.reportview.build_match_conditions(dt, diff --git a/wnf.py b/wnf.py index e82b4d2190..ec1dadbf05 100755 --- a/wnf.py +++ b/wnf.py @@ -264,10 +264,11 @@ def patch(patch_module, site=None, force=False): print "\n".join(webnotes.modules.patch_handler.log_list) @cmd -def update_all_sites(remote=None, branch=None): +def update_all_sites(remote=None, branch=None, verbose=True): pull(remote, branch) build() - latest(site="all") + for site in get_sites(): + latest(site=site, verbose=verbose) @cmd def reload_doc(module, doctype, docname, site=None, force=False):