From c5857c8c2ec004a782a64c63442721c58bd98c45 Mon Sep 17 00:00:00 2001
From: Yucheng Low <yucheng_low@apple.com>
Date: Mon, 18 Feb 2019 12:49:08 -0800
Subject: [PATCH] Fixes S3 write path for SFrames (#1416)

---
 src/fileio/fs_utils.cpp | 44 +++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/fileio/fs_utils.cpp b/src/fileio/fs_utils.cpp
index a2899a2567..7c6d8cfcb7 100644
--- a/src/fileio/fs_utils.cpp
+++ b/src/fileio/fs_utils.cpp
@@ -277,27 +277,29 @@ EXPORT bool create_directory_or_throw(const std::string& path) {
 
   // this function throws if the directory still doesn't exist
   // at that location
-  file_status status = get_file_status(path);
-  switch (status) {
-    case file_status::MISSING:
-      log_and_throw_io_failure(
-        "Unable to create directory structure at " +
-        path +
-        ". Ensure that you have write permission to this location, or try again with a different path."
-      );
-      break;
-    case file_status::REGULAR_FILE:
-      log_and_throw_io_failure(
-        "Unable to create directory at " +
-        path +
-        ". A non-directory file already exists there. Delete that file, or try again with a different path."
-      );
-    case file_status::DIRECTORY:
-      // happy path, return below
-      break;
-    default:
-      // not sure what error message to give; fall back to current I/O error
-      log_and_throw_current_io_failure();
+  if (!boost::starts_with(path, "s3://")) {
+    file_status status = get_file_status(path);
+    switch (status) {
+      case file_status::MISSING:
+        log_and_throw_io_failure(
+          "Unable to create directory structure at " +
+          sanitize_url(path) +
+          ". Ensure that you have write permission to this location, or try again with a different path."
+        );
+        break;
+      case file_status::REGULAR_FILE:
+        log_and_throw_io_failure(
+          "Unable to create directory at " +
+          sanitize_url(path) +
+          ". A non-directory file already exists there. Delete that file, or try again with a different path."
+        );
+      case file_status::DIRECTORY:
+        // happy path, return below
+        break;
+      default:
+        // not sure what error message to give; fall back to current I/O error
+        log_and_throw_current_io_failure();
+    }
   }
 
   // result will still indicate whether it was created or not