Repository: incubator-brooklyn Updated Branches: refs/heads/master bcd39d589 -> 98f7667de
fixed BROOKLYN-128: ArchiveUtils ignores destFile, prefers optionalDestFile during deploy Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/78c27273 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/78c27273 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/78c27273 Branch: refs/heads/master Commit: 78c27273232fee31f4f63a9aaea05e5abb08e39a Parents: 7234b83 Author: michaeldye <[email protected]> Authored: Mon Jan 26 09:34:45 2015 -0700 Committer: michaeldye <[email protected]> Committed: Mon Jan 26 09:34:45 2015 -0700 ---------------------------------------------------------------------- core/src/main/java/brooklyn/util/file/ArchiveUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/78c27273/core/src/main/java/brooklyn/util/file/ArchiveUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/file/ArchiveUtils.java b/core/src/main/java/brooklyn/util/file/ArchiveUtils.java index 93025f0..b93783c 100644 --- a/core/src/main/java/brooklyn/util/file/ArchiveUtils.java +++ b/core/src/main/java/brooklyn/util/file/ArchiveUtils.java @@ -272,8 +272,8 @@ public class ArchiveUtils { } // extract, now using task if available - MutableList<String> commands = MutableList.copyOf(installCommands(optionalDestFile)) - .appendAll(extractCommands(optionalDestFile, optionalTmpDir, destDir, false, keepArchiveAfterUnpacking)); + MutableList<String> commands = MutableList.copyOf(installCommands(destFile)) + .appendAll(extractCommands(destFile, optionalTmpDir, destDir, false, keepArchiveAfterUnpacking)); if (DynamicTasks.getTaskQueuingContext()!=null) { result = DynamicTasks.queue(SshTasks.newSshExecTaskFactory(machine, commands.toArray(new String[0])).summary("extracting archive").requiringExitCodeZero()).get(); } else {
