From 23e327713b03bb2f15f75a163f773b64eca5dd16 Mon Sep 17 00:00:00 2001 From: sLoPPydrive Date: Sun, 7 Jan 2018 01:15:16 +0100 Subject: [PATCH] PGScout URL will now also be normalized on --only-server instances --- pogom/utils.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pogom/utils.py b/pogom/utils.py index b66d217cd2..0ea0f2e786 100644 --- a/pogom/utils.py +++ b/pogom/utils.py @@ -764,15 +764,6 @@ def get_args(): args.accounts_L30.append(hlvl_account) - # Normalize PGScout URL - if args.pgscout_url: - # Remove trailing slashes - if args.pgscout_url.endswith('/'): - args.pgscout_url = args.pgscout_url[:len(args.pgscout_url) - 1] - # Add /iv if needed - if not args.pgscout_url.endswith('/iv'): - args.pgscout_url = '{}/iv'.format(args.pgscout_url) - # Prepare the IV/CP scanning filters. args.enc_whitelist = [] @@ -819,6 +810,15 @@ def get_args(): else: args.wh_types = frozenset([i for i in args.wh_types]) + # Normalize PGScout URL + if args.pgscout_url: + # Remove trailing slashes + if args.pgscout_url.endswith('/'): + args.pgscout_url = args.pgscout_url[:len(args.pgscout_url) - 1] + # Add /iv if needed + if not args.pgscout_url.endswith('/iv'): + args.pgscout_url = '{}/iv'.format(args.pgscout_url) + args.locales_dir = 'static/dist/locales' args.data_dir = 'static/dist/data'