From 3e76bdb96e66ab900d16225e973c6888cb3c3b4c Mon Sep 17 00:00:00 2001 From: jpic Date: Tue, 28 Jan 2020 02:03:22 +0100 Subject: [PATCH] Copy: support multiple srcs --- podctl/visitors/copy.py | 13 ++++++------- tests/test_build_copy.sh | 4 +++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/podctl/visitors/copy.py b/podctl/visitors/copy.py index cbc9e6a..ebd2cfb 100644 --- a/podctl/visitors/copy.py +++ b/podctl/visitors/copy.py @@ -1,7 +1,7 @@ class Copy: - def __init__(self, src, dst): - self.src = src - self.dst = dst + def __init__(self, *args): + self.src = args[:-1] + self.dst = args[-1] def init_build(self, script): count = self.dst.count(':') @@ -14,10 +14,9 @@ class Copy: self.owner = script.variable('user') def build(self, script): - if isinstance(self.src, list): - script.run(f'sudo mkdir -p {self.dst}') - for item in self.src: - script.append(f'cp -a {item} $mnt{self.dst}') + script.run(f'sudo mkdir -p {self.dst}') + for item in self.src: + script.append(f'cp -a {item} $mnt{self.dst}') if self.mode: script.run(f'sudo chmod {self.mode} $mnt{self.dst}') diff --git a/tests/test_build_copy.sh b/tests/test_build_copy.sh index 269355f..e99f522 100644 --- a/tests/test_build_copy.sh +++ b/tests/test_build_copy.sh @@ -14,4 +14,6 @@ trap umounts 0 ctr=$(buildah from $base) mnt=$(buildah mount $ctr) echo "Copy.init_build" -echo "Copy.build" \ No newline at end of file +echo "Copy.build" +buildah run --user root $ctr -- mkdir -p /app +cp -a /home/jpic/src/podctl/tests $mnt/app \ No newline at end of file