From 9097330db729737bcc141018868e32bc471c0207 Mon Sep 17 00:00:00 2001 From: Auke Klazema <klazema@astron.nl> Date: Tue, 5 Mar 2019 13:22:56 +0000 Subject: [PATCH] SW-598: Check on argument before asking password --- .../data/Coordinates/load_hba_rotations.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MAC/Deployment/data/Coordinates/load_hba_rotations.py b/MAC/Deployment/data/Coordinates/load_hba_rotations.py index 08fe531a692..2b96c3d1f61 100755 --- a/MAC/Deployment/data/Coordinates/load_hba_rotations.py +++ b/MAC/Deployment/data/Coordinates/load_hba_rotations.py @@ -71,6 +71,13 @@ if __name__ == '__main__': dbPort = options.dbPort dbUser = options.dbUser + # print sys.argv + if len(args) != 1: + parser.print_help() + sys.exit(1) + + filename = str(args[0]) + dbPassword = getpass.getpass() host = "{}:{}".format(dbHost, dbPort) @@ -81,13 +88,6 @@ if __name__ == '__main__': # calling stored procedures only works from the pg module for some reason. db2 = pg.connect(user=dbUser, host=dbHost, dbname=dbName, port=dbPort, passwd=dbPassword) - # print sys.argv - if len(args) != 1: - parser.print_help() - sys.exit(1) - - filename = str(args[0]) - lines = get_rotation_lines(filename) for line in lines: (stationname, rotation0, rotation1) = get_rotation(line) -- GitLab