From 80c196e4309fcec58dd81aa3357b6175779bced4 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 5 Oct 2020 08:44:13 +0300 Subject: fix: things linter complained about --- contractor | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/contractor b/contractor index 66693ed..5847485 100755 --- a/contractor +++ b/contractor @@ -248,7 +248,7 @@ class CopyWorkerImage(RemoteExecution): def argv(self): return ["sh", "-c", "rm -f temp.img; cp worker.img temp.img"] self.ssh(["rm", "-f", TEMP_IMG]) - ret = self.ssh(["cp", WORKER_IMG, TEMP_IMG]) + self.ssh(["cp", WORKER_IMG, TEMP_IMG]) class StartGuestNetworking(MayFail): @@ -560,7 +560,9 @@ def cmd_status(args): def cmd_build(args): - vrb = lambda msg: verbose(args, msg) + def vrb(msg): + verbose(args, msg) + vrb("building according to {}".format(args.spec)) bs = load_build_spec(args.spec) dest, port = manager_destination(args) @@ -659,6 +661,9 @@ def load_default_config(args): def load_config(filename, args): + def identity(x): + return x + with open(filename) as f: config = yaml.safe_load(f) @@ -673,7 +678,7 @@ def load_config(filename, args): if key in config: func = keys[key] if func is None: - func = lambda x: x + func = identity setattr(args, key, func(config[key])) -- cgit v1.2.1