Re: master 4808c63d43f: Add Tramp method "apptainer"

Re: master 4808c63d43f: Add Tramp method "apptainer"

[Po Lu]

Michael Albinus via Mailing list for Emacs changes <emacs-diffs@gnu.org>
writes:

> branch: master
> commit 4808c63d43f529f41aac2f2bb14df7ab8f882440
> Author: Michael Albinus <michael.albinus@gmx.de>
> Commit: Michael Albinus <michael.albinus@gmx.de>
>
>     Add Tramp method "apptainer"
>     
>     * doc/misc/tramp.texi (Top, Configuration): Add "Optional methods".
>     (Optional methods): New section.
>     (Inline methods) <androidsu, toolbox, flatpak>: These are optional
>     methods.
>     (Inline methods) <apptainer>: Add.
>     
>     * etc/NEWS: New Tramp method "apptainer".
>     Some Tramp methods are optional.
>     Fix typos.
>     
>     * lisp/net/tramp-androidsu.el (tramp-enable-androidsu-method):
>     New defun.  Call it when `system-type' is `android'.
>     
>     * lisp/net/tramp-container.el (tramp-apptainer-program): New defcustom.
>     (tramp-apptainer-method): New defconst.
>     (tramp-apptainer--completion-function)
>     (tramp-enable-toolbox-method, tramp-enable-flatpak-method)
>     (tramp-enable-apptainer-method): New defuns.
>     
>     * lisp/net/tramp.el (tramp-enable-method): New defun.
>     
>     * test/lisp/net/tramp-tests.el (tramp--test-container-p):
>     Add "apptainer".
>     (tramp--test-supports-processes-p): Extend function.

With this change, Tramp ceases to be autoloaded on Android, and when
manually required, signals an error as follows:

byte-code: Recursive load: "/assets/lisp/net/tramp.elc",
"/assets/lisp/net/tramp-androidsu.elc",
"/assets/lisp/net/tramp-loaddefs.elc",
"/assets/lisp/net/tramp-compat.elc", "/assets/lisp/net/tramp.elc",
"/assets/lisp/net/tramp-androidsu.elc",
"/assets/lisp/net/tramp-loaddefs.elc",
"/assets/lisp/net/tramp-compat.elc", "/assets/lisp/net/tramp.elc",
"/assets/lisp/net/tramp-androidsu.elc",
"/assets/lisp/net/tramp-loaddefs.elc",
"/assets/lisp/net/tramp-compat.elc", "/assets/lisp/net/tramp.elc",
"/assets/lisp/net/tramp-androidsu.elc",
"/assets/lisp/net/tramp-loaddefs.elc",
"/assets/lisp/net/tramp-compat.elc", "/assets/lisp/net/tramp.elc"

Re: master 4808c63d43f: Add Tramp method "apptainer"

[Michael Albinus]

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

Po Lu <luangruo@yahoo.com> writes:

Hi,

> With this change, Tramp ceases to be autoloaded on Android, and when
> manually required, signals an error as follows:

Oops. Does this help?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 553 bytes --]

diff --git a/lisp/tramp-androidsu.el b/lisp/tramp-androidsu.el
index 3dcee8e2..09dcd4d7 100644
--- a/lisp/tramp-androidsu.el
+++ b/lisp/tramp-androidsu.el
@@ -94,8 +94,9 @@ may edit files belonging to any and all applications."
                `(,tramp-androidsu-method nil ,tramp-root-id-string)))

 ;;;###tramp-autoload
-(when (eq system-type 'android)
-  (tramp-enable-androidsu-method))
+(tramp--with-startup
+ (when (eq system-type 'android)
+   (tramp-enable-androidsu-method)))

 (defvar android-use-exec-loader) ; androidfns.c.

Re: master 4808c63d43f: Add Tramp method "apptainer"

[Michael Albinus]

Michael Albinus <michael.albinus@gmx.de> writes:

Hi,

>> With this change, Tramp ceases to be autoloaded on Android, and when
>> manually required, signals an error as follows:
>
> Oops. Does this help?
>
> diff --git a/lisp/tramp-androidsu.el b/lisp/tramp-androidsu.el
> index 3dcee8e2..09dcd4d7 100644
> --- a/lisp/tramp-androidsu.el
> +++ b/lisp/tramp-androidsu.el
> @@ -94,8 +94,9 @@ may edit files belonging to any and all applications."
>                 `(,tramp-androidsu-method nil ,tramp-root-id-string)))
>
>  ;;;###tramp-autoload
> -(when (eq system-type 'android)
> -  (tramp-enable-androidsu-method))
> +(tramp--with-startup
> + (when (eq system-type 'android)
> +   (tramp-enable-androidsu-method)))
>
>  (defvar android-use-exec-loader) ; androidfns.c.

I could reproduce the problem locally. The proposed fix cures it, so I
have pushed it to master.

Best regards, Michael.

Re: master 4808c63d43f: Add Tramp method "apptainer"

[Po Lu]

Michael Albinus <michael.albinus@gmx.de> writes:

> Michael Albinus <michael.albinus@gmx.de> writes:
>
> Hi,
>
>>> With this change, Tramp ceases to be autoloaded on Android, and
>>> when
>>> manually required, signals an error as follows:
>>
>> Oops. Does this help?
>>
>> diff --git a/lisp/tramp-androidsu.el b/lisp/tramp-androidsu.el
>> index 3dcee8e2..09dcd4d7 100644
>> --- a/lisp/tramp-androidsu.el
>> +++ b/lisp/tramp-androidsu.el
>> @@ -94,8 +94,9 @@ may edit files belonging to any and all applications."
>>                 `(,tramp-androidsu-method nil ,tramp-root-id-string)))
>>
>>  ;;;###tramp-autoload
>> -(when (eq system-type 'android)
>> -  (tramp-enable-androidsu-method))
>> +(tramp--with-startup
>> + (when (eq system-type 'android)
>> +   (tramp-enable-androidsu-method)))
>>
>>  (defvar android-use-exec-loader) ; androidfns.c.
>
> I could reproduce the problem locally. The proposed fix cures it, so I
> have pushed it to master.
>
> Best regards, Michael.

Thanks.