summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lwirzenius@wikimedia.org>2020-09-18 16:34:09 +0300
committerLars Wirzenius <lwirzenius@wikimedia.org>2020-09-18 16:34:09 +0300
commit2a2f1cda35a985ef5fdd7e5d89f365eb270b8819 (patch)
tree104ad98527f96c3b333b2f582a240af534321a2e
parent44a3690c10c3de10ac8fa9c3da5667c5c173bd6f (diff)
downloadick-contractor-2a2f1cda35a985ef5fdd7e5d89f365eb270b8819.tar.gz
fix: nits from linters
-rwxr-xr-xcontractor12
1 files changed, 8 insertions, 4 deletions
diff --git a/contractor b/contractor
index 66693ed..2811a1c 100755
--- a/contractor
+++ b/contractor
@@ -247,8 +247,6 @@ 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])
class StartGuestNetworking(MayFail):
@@ -560,7 +558,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)
@@ -669,11 +669,15 @@ def load_config(filename, args):
"verbose": None,
"log": os.path.expanduser,
}
+
+ def identity(x):
+ return x
+
for key in keys:
if key in config:
func = keys[key]
if func is None:
- func = lambda x: x
+ func = identity
setattr(args, key, func(config[key]))