summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2020-10-05 08:44:13 +0300
committerLars Wirzenius <liw@liw.fi>2020-10-05 08:44:13 +0300
commit80c196e4309fcec58dd81aa3357b6175779bced4 (patch)
tree8707dc0ce8a2e290e56613998ff70983a6d38e42
parentd74708086b78a1dec2a6e78227f95568583cff9e (diff)
downloadick-contractor-80c196e4309fcec58dd81aa3357b6175779bced4.tar.gz
fix: things linter complained about
-rwxr-xr-xcontractor11
1 files 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]))