Repository: mesos Updated Branches: refs/heads/master 81214c872 -> 9921e4609
Fixed variable shadowing in `launchTaskPosix`. Review: https://reviews.apache.org/r/48836/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9921e460 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9921e460 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9921e460 Branch: refs/heads/master Commit: 9921e46093ebf642d73adc49ca15b583ab9eef99 Parents: 81214c8 Author: haosdent huang <haosd...@gmail.com> Authored: Fri Jun 17 15:34:44 2016 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Fri Jun 17 15:34:44 2016 -0700 ---------------------------------------------------------------------- src/launcher/posix/executor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/9921e460/src/launcher/posix/executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/posix/executor.cpp b/src/launcher/posix/executor.cpp index 76c7a26..b393db6 100644 --- a/src/launcher/posix/executor.cpp +++ b/src/launcher/posix/executor.cpp @@ -79,14 +79,14 @@ pid_t launchTaskPosix( // root filesystem and changing the user before exec-ing the // user process. #ifdef __linux__ - Result<string> user = os::user(); - if (user.isError()) { - cerr << "Failed to get current user: " << user.error() << endl; + Result<string> _user = os::user(); + if (_user.isError()) { + cerr << "Failed to get current user: " << _user.error() << endl; abort(); - } else if (user.isNone()) { + } else if (_user.isNone()) { cerr << "Current username is not found" << endl; abort(); - } else if (user.get() != "root") { + } else if (_user.get() != "root") { cerr << "The command executor requires root with rootfs" << endl; abort(); }
