Repository: mesos Updated Branches: refs/heads/master 285cf3d7d -> 03def4992
Prevented fetcher from erroneously reporting a non-archive when successfully extracting from one. Review: https://reviews.apache.org/r/37891 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/03def499 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/03def499 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/03def499 Branch: refs/heads/master Commit: 03def499212b089031fec8bfe73e0f0eb043c37e Parents: 285cf3d Author: Bernd Mathiske <[email protected]> Authored: Fri Aug 28 08:49:40 2015 -0700 Committer: Bernd Mathiske <[email protected]> Committed: Fri Aug 28 08:49:40 2015 -0700 ---------------------------------------------------------------------- src/launcher/fetcher.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/03def499/src/launcher/fetcher.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp index 79b1d98..0f1533a 100644 --- a/src/launcher/fetcher.cpp +++ b/src/launcher/fetcher.cpp @@ -261,7 +261,7 @@ static Try<string> fetchBypassingCache( Try<bool> extracted = extract(path, sandboxDirectory); if (extracted.isError()) { return Error(extracted.error()); - } else { + } else if (!extracted.get()) { LOG(WARNING) << "Copying instead of extracting resource from URI with " << "'extract' flag, because it does not seem to be an " << "archive: " << uri.value();
