From 186c186bd77ee2b19f6d71bb04f25c35fb3984d6 Mon Sep 17 00:00:00 2001 From: Vanessa Sochat Date: Wed, 31 Oct 2018 12:15:20 -0400 Subject: [PATCH] fixing bug with copy to support multiple src src dest (and not other way around) --- CHANGELOG.md | 1 + spython/main/parse/docker.py | 4 ++-- spython/version.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 198265e4..2ae5ad73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to singularity on pypi), and the versions here will coincide with these releases. ## [master](https://github.com/singularityhub/singularity-cli/tree/master) + - COPY command should honor src src dest (and not reverse) (0.0.47) - ENV variables in Dockerfile can be empty (like unsetting) (0.0.46) - COPY can handle multiple sources to one destination for Dockerfile parser (0.0.45) - Adding DockerRecipe, SingularityRecipe "load" action to load file diff --git a/spython/main/parse/docker.py b/spython/main/parse/docker.py index 041413bd..14904615 100644 --- a/spython/main/parse/docker.py +++ b/spython/main/parse/docker.py @@ -154,8 +154,8 @@ def _copy(self, lines): for line in lines: values = line.split(" ") - frompath = values.pop(0) - for topath in values: + topath = values.pop() + for frompath in values: self._add_files(frompath, topath) diff --git a/spython/version.py b/spython/version.py index 3a205b5b..b7cd9325 100644 --- a/spython/version.py +++ b/spython/version.py @@ -16,7 +16,7 @@ -__version__ = "0.0.46" +__version__ = "0.0.47" AUTHOR = 'Vanessa Sochat' AUTHOR_EMAIL = 'vsochat@stanford.edu' NAME = 'spython'