From patchwork Wed Oct 13 19:32:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 33819 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F087D27BBE3; Wed, 13 Oct 2021 20:36:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CB46827BBE1 for ; Wed, 13 Oct 2021 20:36:14 +0100 (BST) Received: from localhost ([::1]:44030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mak2v-0004UD-M8 for patchwork@mira.cbaines.net; Wed, 13 Oct 2021 15:36:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mak2k-0004SC-QK for guix-patches@gnu.org; Wed, 13 Oct 2021 15:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50223) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mak2k-0005dN-GL for guix-patches@gnu.org; Wed, 13 Oct 2021 15:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mak2k-0002VN-Ds for guix-patches@gnu.org; Wed, 13 Oct 2021 15:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51188] [PATCH] gnu: emacs: Find real GVFS processes. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Oct 2021 19:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51188@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16341537349558 (code B ref -1); Wed, 13 Oct 2021 19:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Oct 2021 19:35:34 +0000 Received: from localhost ([127.0.0.1]:33536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mak2I-0002U6-ER for submit@debbugs.gnu.org; Wed, 13 Oct 2021 15:35:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:46426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mak2G-0002Tu-Po for submit@debbugs.gnu.org; Wed, 13 Oct 2021 15:35:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mak2G-0003n8-BC for guix-patches@gnu.org; Wed, 13 Oct 2021 15:35:32 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mak2E-000303-RB for guix-patches@gnu.org; Wed, 13 Oct 2021 15:35:32 -0400 Received: by mail-wr1-x442.google.com with SMTP id t2so11898142wrb.8 for ; Wed, 13 Oct 2021 12:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=xXcEPofrXpcWA9FtgMd+5qZCkLIAgAa1XnvwpESrJGg=; b=UX1lBLhac48VHpE6oy6HweyQV+UT+XaUgwLHMuIAWG8rmgp0xQVZGoVXTtfWSOy/eg 6XfehFT375W9S3coPOO3jHylYywvxYxe/rmCDuAjID11tEUHNFN5zw7kZfHfzV/3fw+0 YU/X9AwKMVGt0sOaNObPRYxo1iJrLemr0xdgvTeG0sjyFhw2EvHo9QXxPeruEllDQ6FU Nlr/tyt0sHuXbji2QbUkd1/DXngYXF6NGjfQN4EE6PlLUqxSWaFDVe6C5cdPJbZ5+Fla 75CdUucNfrChoDxk57FyRvN3sS7JUK3eZikx31hCGX1LpbuD+yIBWPqDsUQu3zY4jro2 9rBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=xXcEPofrXpcWA9FtgMd+5qZCkLIAgAa1XnvwpESrJGg=; b=hHz5qCD8wYbiojclxxlV+oUtl4T1BB8RvyNdg/UjPQJDH4rpmTYgCuOCOp5MlwqtlB fMnpezVXMOjnLhTtA5+O1ehTYw0RknfOPut5pl3lEteHf67ZYrVynrv+KE9A/GAhfYN9 7HvNZ/sXB3j0AOuguNhXRauTEQb+dCWmYsBk+wBpgXygTLXMxBpdpVznNA3iTVhVuDWN sQgFJ92k1fe3zNnvt+hDaGCVGrobPV9VhLYd4Wl0Bo2qZohCaqMHeR7WftcqSi+hFTMC dgkFs0eUvKBzEowpm+MgyFLGPAWVdDEwYowF5eo08fWW4MJr5ZeimCAErXDXdzej/Vzq a3eg== X-Gm-Message-State: AOAM530mZfnHuo34tk2OrCjK2QK/+41HdUzYZnYw0nNyjEyFqKn37JyS dBe2KAU6VICgcE9YrRQoIa1LCY9kK04= X-Google-Smtp-Source: ABdhPJzi/O/GyqMQlB4OPh2IlRoAwIFRLD7af2R9Yy381DX6iE8I6QDTv1MtLkPfQDyh2g/e9wYBeQ== X-Received: by 2002:adf:97d0:: with SMTP id t16mr1239929wrb.124.1634153729126; Wed, 13 Oct 2021 12:35:29 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g70sm288664wme.29.2021.10.13.12.35.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Oct 2021 12:35:28 -0700 (PDT) From: Liliana Marie Prikler Date: Wed, 13 Oct 2021 21:32:07 +0200 MIME-Version: 1.0 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=liliana.prikler@gmail.com; helo=mail-wr1-x442.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs)[#:phases]: Expand calls to “tramp-compat-process-running-p” so that Guix wrappers are also matched. --- gnu/packages/emacs.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6d9950d068..a59931ddc4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -136,6 +136,12 @@ "lisp/progmodes/sh-script.el") (("\"/bin/sh\"") (format #f "~s" (which "sh")))) + ;; match ".gvfs-fuse-daemon-real" and ".gvfsd-fuse-real" + ;; respectively when looking for GVFS processes. + (substitute* "lisp/net/tramp-gvfs.el" + (("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process) + (format #f "(or ~a (tramp-compat-process-running-p ~s))" + all (string-append "." process "-real")))) #t)) (add-before 'configure 'fix-/bin/pwd (lambda _