* bug#49699: 28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 10.14
@ 2021-07-22 19:42 Alex Bochannek
2021-07-23 18:32 ` Michael Albinus
0 siblings, 1 reply; 3+ messages in thread
From: Alex Bochannek @ 2021-07-22 19:42 UTC (permalink / raw)
To: 49699
[-- Attachment #1: Type: text/plain, Size: 377 bytes --]
Hello!
On macOS 10.14 (and some 10.15) with a pre-8.0 OpenSSH, the check for
the `-T' option when using SCP gives an incorrect result because the
error message (presumably from the BSD getopt(3)) is different than what
is checked for. The below patch fixes that.
Apple upgraded OpenSSH from 7.9 to 8.1 for macOS 10.15.4 and with that
the `-T' option to SCP became available.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 597 bytes --]
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 8b4c78fe65..f94508303d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4782,7 +4782,9 @@ tramp-scp-strict-file-name-checking
(with-temp-buffer
(tramp-call-process vec "scp" nil t nil "-T")
(goto-char (point-min))
- (unless (search-forward-regexp "unknown option -- T" nil t)
+ (unless
+ (search-forward-regexp
+ "\\(illegal\\|unknown\\) option -- T" nil t)
(setq tramp-scp-strict-file-name-checking "-T")))))))
tramp-scp-strict-file-name-checking)))
[-- Attachment #3: Type: text/plain, Size: 19 bytes --]
Thanks!
--
Alex.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#49699: 28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 10.14
2021-07-22 19:42 bug#49699: 28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 10.14 Alex Bochannek
@ 2021-07-23 18:32 ` Michael Albinus
2021-07-23 21:24 ` Alex Bochannek
0 siblings, 1 reply; 3+ messages in thread
From: Michael Albinus @ 2021-07-23 18:32 UTC (permalink / raw)
To: Alex Bochannek; +Cc: 49699-done
Version: 28.1
Alex Bochannek <alex@bochannek.com> writes:
> Hello!
Hi Alex,
> On macOS 10.14 (and some 10.15) with a pre-8.0 OpenSSH, the check for
> the `-T' option when using SCP gives an incorrect result because the
> error message (presumably from the BSD getopt(3)) is different than what
> is checked for. The below patch fixes that.
Thanks for this, I've pushed it to master. Closing the bug.
> Thanks!
Best regards, Michael.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#49699: 28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 10.14
2021-07-23 18:32 ` Michael Albinus
@ 2021-07-23 21:24 ` Alex Bochannek
0 siblings, 0 replies; 3+ messages in thread
From: Alex Bochannek @ 2021-07-23 21:24 UTC (permalink / raw)
To: Michael Albinus; +Cc: 49699-done
Michael Albinus <michael.albinus@gmx.de> writes:
> Version: 28.1
>
> Alex Bochannek <alex@bochannek.com> writes:
>
>> Hello!
>
> Hi Alex,
>
>> On macOS 10.14 (and some 10.15) with a pre-8.0 OpenSSH, the check for
>> the `-T' option when using SCP gives an incorrect result because the
>> error message (presumably from the BSD getopt(3)) is different than what
>> is checked for. The below patch fixes that.
>
> Thanks for this, I've pushed it to master. Closing the bug.
Thanks!
--
Alex.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-23 21:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-22 19:42 bug#49699: 28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 10.14 Alex Bochannek
2021-07-23 18:32 ` Michael Albinus
2021-07-23 21:24 ` Alex Bochannek
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).