From 324af04de034ede38173acd494eab60c72f59d8e Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Fri, 11 Oct 2019 13:02:39 +0100 Subject: [PATCH] Don't return the same thing twice The add_relay and provisionRelay functions both returned the alias. Only use the output from one function. --- commands/auto.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/commands/auto.py b/commands/auto.py index 8832bb7..9dde92c 100644 --- a/commands/auto.py +++ b/commands/auto.py @@ -18,19 +18,18 @@ class AutoCommand: num, alias = main.network[spl[1]].add_relay(relayNum) success("Successfully created relay %i on network %s with alias %s" % (num, spl[1], alias)) main.saveConf("network") - rtrn = provision.provisionRelay(relayNum, spl[1]) - success("Started provisioning network %s on relay %s for alias %s" % (spl[1], spl[2], rtrn)) + provision.provisionRelay(relayNum, spl[1]) + success("Started provisioning network %s on relay %s for alias %s" % (spl[1], spl[2], alias)) return elif length == 2: if not spl[1] in main.network.keys(): failure("No such network: %s" % spl[1]) return for i in main.alias.keys(): - print("num", i) num, alias = main.network[spl[1]].add_relay(i) success("Successfully created relay %i on network %s with alias %s" % (num, spl[1], alias)) - rtrn = provision.provisionRelay(num, spl[1]) - success("Started provisioning network %s on relay %s for alias %s" % (spl[1], num, rtrn)) + provision.provisionRelay(num, spl[1]) + success("Started provisioning network %s on relay %s for alias %s" % (spl[1], num, alias)) main.saveConf("network") return elif length == 1: @@ -38,8 +37,8 @@ class AutoCommand: for x in main.alias.keys(): num, alias = main.network[i].add_relay(x) success("Successfully created relay %i on network %s with alias %s" % (num, i, alias)) - rtrn = provision.provisionRelay(num, i) - success("Started provisioning network %s on relay %s for alias %s" % (i, num, rtrn)) + provision.provisionRelay(num, i) + success("Started provisioning network %s on relay %s for alias %s" % (i, num, alias)) main.saveConf("network") return else: