From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#68227: 29.1; [tramp] adb stopped working (after upgrade from Emacs 28 to 29?) Date: Fri, 19 Jan 2024 11:31:41 +0100 Message-ID: <87r0id4nsi.fsf@gmx.de> References: <87jzor6nhk.fsf@gmail.com> <874jfoavve.fsf@gmx.de> <875y03xjma.fsf@gmail.com> <87r0iqc0op.fsf@gmx.de> <87fryvmx0g.fsf@gmail.com> <87edef6q4k.fsf@gmx.de> <8734uuj5qp.fsf@gmail.com> Reply-To: Michael Albinus Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3834"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 68227@debbugs.gnu.org To: Maxim Cournoyer Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 19 11:32:25 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rQmAi-0000dC-31 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 19 Jan 2024 11:32:24 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQmAY-0007yh-TG; Fri, 19 Jan 2024 05:32:15 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQmAK-0007xJ-Ju for bug-gnu-emacs@gnu.org; Fri, 19 Jan 2024 05:32:00 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQmAK-0005XQ-BD for bug-gnu-emacs@gnu.org; Fri, 19 Jan 2024 05:32:00 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQmAL-0002uO-VT for bug-gnu-emacs@gnu.org; Fri, 19 Jan 2024 05:32:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michael Albinus Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 19 Jan 2024 10:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68227 X-GNU-PR-Package: emacs Original-Received: via spool by 68227-submit@debbugs.gnu.org id=B68227.170566031310802 (code B ref 68227); Fri, 19 Jan 2024 10:32:01 +0000 Original-Received: (at 68227) by debbugs.gnu.org; 19 Jan 2024 10:31:53 +0000 Original-Received: from localhost ([127.0.0.1]:57607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQmAC-0002no-Mc for submit@debbugs.gnu.org; Fri, 19 Jan 2024 05:31:53 -0500 Original-Received: from mout.gmx.net ([212.227.17.21]:35355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQmAB-0002ij-1g for 68227@debbugs.gnu.org; Fri, 19 Jan 2024 05:31:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1705660302; x=1706265102; i=michael.albinus@gmx.de; bh=OUr0uo/X6cmhJ+KMsYwfKK/XecBP0XpY8V6OVviXTVg=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References: Date; b=JihsQz/9X+2iR/26wlRbQW2COViGYv8NKFEDH6KLqOQxiw/qTEiqgB3TDTRyl8d8 4MpiUbi5Q7l11Rl5QXf13wyI0UC0qstf+X/IwX94UyhVlOI5Equ/khfVPD9ocSbBK hCWmtSCv1dT+bNE19meoquE4IjVqvdM4yQ0xKjxvaTJQRU0f28KEw9mLv5Aw4D53A Pzu8EvkGDBKoHTc+9YsnI0KZCOlR+dKXqXKtFhXssJbt6JFUbYI3WeM0/XeWyRK/S pJdZwr1A2JNAQ2Ylx4G7YTVvMNVvOnAgndiNPqrGy+k1LOT5B2YUUshv4s8MGjJse rFa92ODCoVJQ9EplyQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.39.16]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MulmF-1r8y1m3W9j-00rsK7; Fri, 19 Jan 2024 11:31:41 +0100 In-Reply-To: <8734uuj5qp.fsf@gmail.com> (Maxim Cournoyer's message of "Thu, 18 Jan 2024 23:40:14 -0500") X-Provags-ID: V03:K1:CLacRdjbBT1+U3EvkGZMoziayFTjPlInZgR1NEKYN1CD7qXB3NR YMBe8ADmhJVoN8BJJqup54dXbzdlb6JwHEVYNtmIt8eKfo8tgA4tM3vY3sZKCPCXImg+CSY EUw3M6MiLqx/JWYBby+jnXuYRTO0NmqMC9mCFrYsP6PVJB/qXyo1vYAjAKVbs07VAUCIxxT 6llzlfkrdRbNDMdNQbFEQ== UI-OutboundReport: notjunk:1;M01:P0:SwmktGHsDok=;/kzHXpPDNC5bA/+7VSBPuWwdlf+ bbjyh5DVvpsziohXn36q+R5WMa54FtzTy2In19UH+iv20n+1U0JbRLLzqsDdWPP9ij8SxKyse Ls5Tz6lkENqbAo5pA5GUJa74aX/XEp/J1pzcexpfu92pXyad7NIqa91c4zeBMloXtZuSDH2RK aFSh7S6Pm0XHQLN91aMmM4Mu6soyYpBiTM4/JpqcOr46CBJDWsARt1vOZKIoIIEWpeasHeg2W yVvIlQXOdO/Mk1cG4lepY7dTPfbJfLFxobPHe6XQ8MPCUs+xljYjwFCUBGbVm6qkZ1BI2A5/5 nw2R54k28ifr0tRFBiLQQ+M054Bg9NJcwHlVICqX9ZBDXnwVhtOATMUjYfXZsnbBu+wCVUv8X +B8nb5Pdsvsblj4hkxYPHQLYZ+GhDslpASdurwAlHbS/s019lVBJV/UGKiV35WzUhuxCV/6QA sqT7C23sT1V9N0Ic4f0gebUbCBK3py3ArrJjb25p8gS9cNyrBK0E7CcTuTQU3Ks91HqM8RSt5 7i/qcJHRu7LJZ5XwQse96QOp9UNve0J3Y2tcd+63wd6ir/wFGpM5PLHBWMZd0+iYZi16agThf Tz5p9m1/ZHMbZpIk5m1uP4TctEf9q5U1fGZwduAvIRTFQQz2rrQap5pCmuTuR1izJAvraEd1p AkF2f6ZSRr4xhBfayvJYXCvlm6Q21N1z0HihXdi2YrQPd0JXqhcHvR1EuFoLFph9vWR84KEj+ xAhOlJCJKEZmmZXwpqmjATHMhKoK5htF57r8l6zhWG/pzfKI0qtMMM876bzAGIU474a+6dIS X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:278495 Archived-At: --=-=-= Content-Type: text/plain Maxim Cournoyer writes: > Hi Michael, Hi Maxim, > Here's the output: Thanks. > 23:36:46.934330 tramp-adb-send-command (6) # ls -1 -d -l / | cat; echo tramp_exit_status $? > 23:36:46.981460 tramp-wait-for-regexp (6) # > ls -1 -d -l / | cat; echo tramp_exit_status $? > ls: Unknown option '-1'. Aborting. > tramp_exit_status 0 > ///2f285da54fff9cb9e1bff67e9b3cf382#$ Well, Tramp still tries "ls -1". It shouldn't. Could you, please try the appended patch? > Thanks, > Maxim Best regards, Michael. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment diff --git a/lisp/tramp-adb.el b/lisp/tramp-adb.el index f2c50983..a0377634 100644 --- a/lisp/tramp-adb.el +++ b/lisp/tramp-adb.el @@ -348,7 +348,9 @@ arguments to pass to the OPERATION." "ls -1 --time-style=long-iso") ;; Can't disable coloring explicitly for toybox ls command. We ;; also must force "ls" to print just one column. - ((tramp-adb-send-command-and-check vec "toybox") "ls -1") + ((tramp-adb-send-command-and-check + vec (concat "ls -1 " (tramp-get-remote-null-device vec))) + "ls -1") ;; On CyanogenMod based system BusyBox is used and "ls" output ;; coloring is enabled by default. So we try to disable it when ;; possible. --=-=-=--