From 8490ccc7bbb3c1f6ff0c02bd10aff4d5e5d7b45f Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 5 Feb 2021 14:18:10 +0000
Subject: [PATCH] pressure-vessel: Drop redundant checks for variable directory

pv_runtime_init_variable_dir() creates it if it doesn't already exist,
so we don't need to check that it already exists, which in turn means
we don't need to pre-create it in main().

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 pressure-vessel/runtime.c | 7 -------
 pressure-vessel/wrap.c    | 8 --------
 2 files changed, 15 deletions(-)

diff --git a/pressure-vessel/runtime.c b/pressure-vessel/runtime.c
index 9932d5dae..bb5d72a59 100644
--- a/pressure-vessel/runtime.c
+++ b/pressure-vessel/runtime.c
@@ -865,13 +865,6 @@ pv_runtime_initable_init (GInitable *initable,
                          self->bubblewrap);
     }
 
-  if (self->variable_dir != NULL
-      && !g_file_test (self->variable_dir, G_FILE_TEST_IS_DIR))
-    {
-      return glnx_throw (error, "\"%s\" is not a directory",
-                         self->variable_dir);
-    }
-
   if (!pv_runtime_init_variable_dir (self, error))
     return FALSE;
 
diff --git a/pressure-vessel/wrap.c b/pressure-vessel/wrap.c
index 6935e678c..4a48a1fb8 100644
--- a/pressure-vessel/wrap.c
+++ b/pressure-vessel/wrap.c
@@ -1614,14 +1614,6 @@ main (int argc,
         }
     }
 
-  if (opt_variable_dir != NULL
-      && g_mkdir_with_parents (opt_variable_dir, 0700) != 0)
-    {
-      glnx_throw_errno_prefix (error, "Unable to create \"%s\"",
-                               opt_variable_dir);
-      goto out;
-    }
-
   tools_dir = find_executable_dir (error);
 
   if (tools_dir == NULL)
-- 
GitLab