From d27126df9a4b87d19674725d0fd7e3c1979ac435 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 15 Jul 2021 16:12:37 -0400 Subject: [PATCH] Bug 574874 - Disable full gdb console support if running CDT in flatpak - add check for flatpak environment variable in GDBBackend_7_12.isFullGdbConsoleSupported() method and return false if variable is set Change-Id: I667a63395592e2671ab3bf6f255e7428371086b3 --- .../src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java index 2c2b1286009..d5652d12def 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016 Ericsson and others. + * Copyright (c) 2016, 2021 Ericsson and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -59,7 +59,8 @@ public class GDBBackend_7_12 extends GDBBackend { @Override public boolean isFullGdbConsoleSupported() { - return !Platform.getOS().equals(Platform.OS_WIN32) && !Platform.getOS().equals(Platform.OS_MACOSX) + return System.getenv("FLATPAK_SANDBOX_DIR") == null //$NON-NLS-1$ + && !Platform.getOS().equals(Platform.OS_WIN32) && !Platform.getOS().equals(Platform.OS_MACOSX) && !fPtyFailure; }