From 3058d413f0352c0927a7da639108cb177ddc5401 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 21 Apr 2017 16:38:05 +0200
Subject: [PATCH] builder: Use flatpak_mkdir_p instead of query + mkdir

---
 builder/builder-main.c           | 3 +--
 builder/builder-source-archive.c | 3 +--
 builder/builder-source-bzr.c     | 3 +--
 builder/builder-source-file.c    | 3 +--
 builder/builder-source-git.c     | 3 +--
 builder/builder-source-patch.c   | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/builder/builder-main.c b/builder/builder-main.c
index f9cbbe22..b50dd83a 100644
--- a/builder/builder-main.c
+++ b/builder/builder-main.c
@@ -159,8 +159,7 @@ bundle_manifest (BuilderContext *build_context,
                                        "sources",
                                        NULL);
   sources_dir = g_file_new_for_path (sources_dir_path);
-  if (!g_file_query_exists (sources_dir, NULL) &&
-      !g_file_make_directory_with_parents (sources_dir, NULL, error))
+  if (!flatpak_mkdir_p (sources_dir, NULL, error))
     return FALSE;
 
   file_name = g_file_get_basename (manifest_file);
diff --git a/builder/builder-source-archive.c b/builder/builder-source-archive.c
index eed5ec57..68ad7f45 100644
--- a/builder/builder-source-archive.c
+++ b/builder/builder-source-archive.c
@@ -623,8 +623,7 @@ builder_source_archive_bundle (BuilderSource  *source,
                                         self->sha256,
                                         NULL);
   download_dir = g_file_new_for_path (download_dir_path);
-  if (!g_file_query_exists (download_dir, NULL) &&
-      !g_file_make_directory_with_parents (download_dir, NULL, error))
+  if (!flatpak_mkdir_p (download_dir, NULL, error))
     return FALSE;
 
   file_name = g_file_get_basename (file);
diff --git a/builder/builder-source-bzr.c b/builder/builder-source-bzr.c
index ea95b545..5d1dae5a 100644
--- a/builder/builder-source-bzr.c
+++ b/builder/builder-source-bzr.c
@@ -288,8 +288,7 @@ builder_source_bzr_bundle (BuilderSource  *source,
                                            "bzr",
                                            NULL);
   bzr_sources_dir = g_file_new_for_path (bzr_sources_dir_path);
-  if (!g_file_query_exists (bzr_sources_dir, NULL) &&
-      !g_file_make_directory_with_parents (bzr_sources_dir, NULL, error))
+  if (!flatpak_mkdir_p (bzr_sources_dir, NULL, error))
     return FALSE;
 
   base_name_tmp = g_strconcat (base_name, ".clone_tmp", NULL);
diff --git a/builder/builder-source-file.c b/builder/builder-source-file.c
index a2ac9dd0..3de98f86 100644
--- a/builder/builder-source-file.c
+++ b/builder/builder-source-file.c
@@ -466,8 +466,7 @@ builder_source_file_bundle (BuilderSource  *source,
                                         self->sha256,
                                         NULL);
   download_dir = g_file_new_for_path (download_dir_path);
-  if (!g_file_query_exists (download_dir, NULL) &&
-      !g_file_make_directory_with_parents (download_dir, NULL, error))
+  if (!flatpak_mkdir_p (download_dir, NULL, error))
     return FALSE;
 
   file_name = g_file_get_basename (file);
diff --git a/builder/builder-source-git.c b/builder/builder-source-git.c
index cf72261b..76882823 100644
--- a/builder/builder-source-git.c
+++ b/builder/builder-source-git.c
@@ -269,8 +269,7 @@ builder_source_git_bundle (BuilderSource  *source,
                                       "git",
                                       NULL);
   mirror_dir = g_file_new_for_path (mirror_dir_path);
-  if (!g_file_query_exists (mirror_dir, NULL) &&
-      !g_file_make_directory_with_parents (mirror_dir, NULL, error))
+  if (!flatpak_mkdir_p (mirror_dir, NULL, error))
     return FALSE;
 
   if (!builder_git_mirror_repo (location,
diff --git a/builder/builder-source-patch.c b/builder/builder-source-patch.c
index f5d7fb30..b43bba5c 100644
--- a/builder/builder-source-patch.c
+++ b/builder/builder-source-patch.c
@@ -301,8 +301,7 @@ builder_source_patch_bundle (BuilderSource  *source,
                                        "patches",
                                        NULL);
   patches_dir = g_file_new_for_path (patches_dir_path);
-  if (!g_file_query_exists (patches_dir, NULL) &&
-      !g_file_make_directory_with_parents (patches_dir, NULL, error))
+  if (!flatpak_mkdir_p (patches_dir, NULL, error))
     return FALSE;
 
   file_name = g_file_get_basename (src);