[gnome-builder] context: warn about invalid project paths at early startup
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] context: warn about invalid project paths at early startup
- Date: Thu, 25 Jan 2018 02:48:26 +0000 (UTC)
commit f088829c05594efedd696832f8641e7719d1be13
Author: Christian Hergert <chergert redhat com>
Date: Wed Jan 24 18:27:29 2018 -0800
context: warn about invalid project paths at early startup
We cannot generate a path properly before the project id has been
generated, and that needs to have the VCS loaded to get the project
name/directory from the workdir.
src/libide/ide-context.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/src/libide/ide-context.c b/src/libide/ide-context.c
index ba780aaa8..eca239db0 100644
--- a/src/libide/ide-context.c
+++ b/src/libide/ide-context.c
@@ -2623,17 +2623,22 @@ ide_context_cache_file (IdeContext *self,
{
g_autoptr(GPtrArray) ar = NULL;
g_autofree gchar *path = NULL;
+ const gchar *project_id;
const gchar *part = first_part;
va_list args;
g_return_val_if_fail (IDE_IS_CONTEXT (self), NULL);
+ g_return_val_if_fail (IDE_IS_PROJECT (self->project), NULL);
g_return_val_if_fail (first_part != NULL, NULL);
+ project_id = ide_project_get_id (self->project);
+ g_return_val_if_fail (project_id != NULL, NULL);
+
ar = g_ptr_array_new ();
g_ptr_array_add (ar, (gchar *)g_get_user_cache_dir ());
g_ptr_array_add (ar, (gchar *)ide_get_program_name ());
g_ptr_array_add (ar, (gchar *)"projects");
- g_ptr_array_add (ar, (gchar *)ide_project_get_id (self->project));
+ g_ptr_array_add (ar, (gchar *)project_id);
va_start (args, first_part);
do
@@ -2675,16 +2680,21 @@ ide_context_cache_filename (IdeContext *self,
{
g_autoptr(GPtrArray) ar = NULL;
const gchar *part = first_part;
+ const gchar *project_id;
va_list args;
g_return_val_if_fail (IDE_IS_CONTEXT (self), NULL);
+ g_return_val_if_fail (IDE_IS_PROJECT (self->project), NULL);
g_return_val_if_fail (first_part != NULL, NULL);
+ project_id = ide_project_get_id (self->project);
+ g_return_val_if_fail (project_id != NULL, NULL);
+
ar = g_ptr_array_new ();
g_ptr_array_add (ar, (gchar *)g_get_user_cache_dir ());
g_ptr_array_add (ar, (gchar *)ide_get_program_name ());
g_ptr_array_add (ar, (gchar *)"projects");
- g_ptr_array_add (ar, (gchar *)ide_project_get_id (self->project));
+ g_ptr_array_add (ar, (gchar *)project_id);
va_start (args, first_part);
do
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]