[gnome-builder] flatpak: remove extra-sources usage
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] flatpak: remove extra-sources usage
- Date: Thu, 11 Jan 2018 09:05:51 +0000 (UTC)
commit 1ec038807cfbe8df849592c05f8cba29b4c607e2
Author: Christian Hergert <chergert redhat com>
Date: Thu Jan 11 01:05:40 2018 -0800
flatpak: remove extra-sources usage
This was unnecessary as it was just a plain-ol-bug in flatpak-builder. That
is being fixed upstream, so we should be fine.
We'll look into bundling flatpak-builder so that we can get things out to
users without them having to update.
src/plugins/flatpak/gbp-flatpak-download-stage.c | 11 -----------
src/plugins/flatpak/gbp-flatpak-pipeline-addin.c | 8 --------
2 files changed, 0 insertions(+), 19 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-download-stage.c
b/src/plugins/flatpak/gbp-flatpak-download-stage.c
index a88882c..f254995 100644
--- a/src/plugins/flatpak/gbp-flatpak-download-stage.c
+++ b/src/plugins/flatpak/gbp-flatpak-download-stage.c
@@ -109,17 +109,6 @@ gbp_flatpak_download_stage_query (IdeBuildStage *stage,
ide_subprocess_launcher_push_argv (launcher, "--download-only");
- if (self->state_dir != NULL)
- {
- /*
- * We need to specify to flatpak-builder the location for the sources
- * so that it doesn't try to ping the remote host. This should
- * _probably_ be fixed in upstream flatpak-builder.
- */
- ide_subprocess_launcher_push_argv (launcher, "--extra-sources");
- ide_subprocess_launcher_push_argv (launcher, self->state_dir);
- }
-
if (!self->force_update)
ide_subprocess_launcher_push_argv (launcher, "--disable-updates");
diff --git a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
index bf67d96..1d50a9d 100644
--- a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
@@ -344,14 +344,6 @@ register_dependencies_stage (GbpFlatpakPipelineAddin *self,
{
ide_subprocess_launcher_push_argv (launcher, "--state-dir");
ide_subprocess_launcher_push_argv (launcher, self->state_dir);
-
- /*
- * We need to specify to flatpak-builder the location for the sources
- * so that it doesn't try to ping the remote host. This should
- * _probably_ be fixed in upstream flatpak-builder.
- */
- ide_subprocess_launcher_push_argv (launcher, "--extra-sources");
- ide_subprocess_launcher_push_argv (launcher, self->state_dir);
}
stop_at_option = g_strdup_printf ("--stop-at=%s", primary_module);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]