[gnome-builder] pipeline: be more explicit in directory checks
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] pipeline: be more explicit in directory checks
- Date: Thu, 25 Jan 2018 01:54:32 +0000 (UTC)
commit 2945a237a9e833f65e3b00a727904b34059eb2c3
Author: Christian Hergert <chergert redhat com>
Date: Wed Jan 24 17:49:07 2018 -0800
pipeline: be more explicit in directory checks
Ensure that this is exactly _build inside the project directory.
src/libide/buildsystem/ide-build-pipeline.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/libide/buildsystem/ide-build-pipeline.c b/src/libide/buildsystem/ide-build-pipeline.c
index 77d299740..9cdabfaf1 100644
--- a/src/libide/buildsystem/ide-build-pipeline.c
+++ b/src/libide/buildsystem/ide-build-pipeline.c
@@ -3036,8 +3036,10 @@ static gboolean
can_remove_builddir (IdeBuildPipeline *self)
{
g_autofree gchar *name = NULL;
+ g_autofree gchar *_build = NULL;
g_autoptr(GFile) builddir = NULL;
g_autoptr(GFile) cache = NULL;
+ IdeContext *context;
g_assert (IDE_IS_BUILD_PIPELINE (self));
@@ -3055,8 +3057,12 @@ can_remove_builddir (IdeBuildPipeline *self)
if (g_file_has_prefix (builddir, cache))
return TRUE;
- name = g_path_get_basename (self->builddir);
- if (dzl_str_equal0 (name, "_build"))
+ /* If this is _build in the project tree, we will allow that too
+ * since we create those sometimes.
+ */
+ context = ide_object_get_context (IDE_OBJECT (self));
+ _build = ide_context_build_filename (context, "_build", NULL);
+ if (g_str_equal (_build, self->builddir))
return TRUE;
g_debug ("%s is not in a cache directory, will not delete it", self->builddir);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]