[gnome-builder] flatpak: drop legacy repo cleanup



commit 24ecc4b50a6ef03eaef93865dcc4202a95f991b5
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jul 24 12:24:58 2018 -0700

    flatpak: drop legacy repo cleanup
    
    A long time ago we had a repository that would be used for installations.
    That was only for a single release of Builder. It's been a few releases
    and so we can drop this now.
    
    It also allows us to shave a bit of time off startup while we synchronously
    block for the flatpak command.

 .../flatpak/gbp-flatpak-application-addin.c        | 30 ----------------------
 src/plugins/flatpak/gbp-flatpak-runtime.h          |  3 ---
 2 files changed, 33 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-application-addin.c 
b/src/plugins/flatpak/gbp-flatpak-application-addin.c
index f78c5cfa4..41bc0279b 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.c
@@ -307,34 +307,6 @@ locate_sdk_free (LocateSdk *locate)
   g_slice_free (LocateSdk, locate);
 }
 
-static gboolean
-gbp_flatpak_application_addin_remove_old_repo (GbpFlatpakApplicationAddin  *self,
-                                               GCancellable                *cancellable,
-                                               GError                     **error)
-{
-  g_autoptr(IdeSubprocessLauncher) launcher = NULL;
-  g_autoptr(IdeSubprocess) process = NULL;
-  gboolean ret = FALSE;
-
-  IDE_ENTRY;
-
-  launcher = ide_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE | 
G_SUBPROCESS_FLAGS_STDERR_SILENCE);
-
-  ide_subprocess_launcher_set_run_on_host (launcher, TRUE);
-  ide_subprocess_launcher_push_argv (launcher, "flatpak");
-  ide_subprocess_launcher_push_argv (launcher, "remote-delete");
-  ide_subprocess_launcher_push_argv (launcher, "--user");
-  ide_subprocess_launcher_push_argv (launcher, "--force");
-  ide_subprocess_launcher_push_argv (launcher, FLATPAK_REPO_NAME);
-
-  process = ide_subprocess_launcher_spawn (launcher, cancellable, error);
-
-  if (process != NULL)
-    ret = ide_subprocess_wait (process, cancellable, error);
-
-  IDE_RETURN (ret);
-}
-
 static void
 gbp_flatpak_application_addin_reload (GbpFlatpakApplicationAddin *self)
 {
@@ -422,7 +394,6 @@ gbp_flatpak_application_addin_load (IdeApplicationAddin *addin,
 
   instance = self;
 
-  gbp_flatpak_application_addin_remove_old_repo (self, NULL, NULL);
   gbp_flatpak_application_addin_reload (self);
 
   /*
@@ -455,7 +426,6 @@ gbp_flatpak_application_addin_unload (IdeApplicationAddin *addin,
   instance = NULL;
 
   dzl_clear_pointer (&self->installations, g_ptr_array_unref);
-  gbp_flatpak_application_addin_remove_old_repo (self, NULL, NULL);
 
   IDE_EXIT;
 }
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime.h b/src/plugins/flatpak/gbp-flatpak-runtime.h
index b68086fca..b147f9502 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime.h
+++ b/src/plugins/flatpak/gbp-flatpak-runtime.h
@@ -27,9 +27,6 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (GbpFlatpakRuntime, gbp_flatpak_runtime, GBP, FLATPAK_RUNTIME, IdeRuntime)
 
-/* TODO: Get rid of this with custom installation */
-#define FLATPAK_REPO_NAME "gnome-builder-builds"
-
 GbpFlatpakRuntime   *gbp_flatpak_runtime_new          (IdeContext           *context,
                                                        FlatpakInstalledRef  *ref,
                                                        GCancellable         *cancellable,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]