You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/25 23:32:40 UTC

[47/50] mesos git commit: Added support for FTS_SLNONE in rmdir.

Added support for FTS_SLNONE in rmdir.

Review: https://reviews.apache.org/r/44874/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c62c53df
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c62c53df
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c62c53df

Branch: refs/heads/0.26.x
Commit: c62c53dfeb008f5bfb9ba90a45dc11269423d844
Parents: 02c5bae
Author: Jojy Varghese <jo...@mesosphere.io>
Authored: Tue Mar 15 17:12:01 2016 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Sun Mar 27 17:25:30 2016 -0400

----------------------------------------------------------------------
 3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/c62c53df/3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp
index 6fca476..6a94e3a 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp
@@ -155,10 +155,12 @@ inline Try<Nothing> rmdir(const std::string& directory, bool recursive = true)
           break;
         // `FTS_DEFAULT` would include any file type which is not
         // explicitly described by any of the other `fts_info` values.
-        // TODO(jojy): Consider adding the case for `FTS_SLNONE`.
         case FTS_DEFAULT:
         case FTS_F:
         case FTS_SL:
+        // `FTS_SLNONE` should never be the case as we dont set
+        // FTS_COMFOLLOW. Adding here for completion.
+        case FTS_SLNONE:
           if (::unlink(node->fts_path) < 0 && errno != ENOENT) {
             Error error = ErrnoError();
             fts_close(tree);