From 3c0f4b27a079b90dc632f5061a81ce28cef24801 Mon Sep 17 00:00:00 2001 From: eryx67 Date: Thu, 29 Nov 2018 10:30:20 +0500 Subject: [PATCH] fix for latest emacs --- dired-toggle-sudo.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dired-toggle-sudo.el b/dired-toggle-sudo.el index 386921b..fe5898e 100644 --- a/dired-toggle-sudo.el +++ b/dired-toggle-sudo.el @@ -37,17 +37,20 @@ unless SUDO-USER is provided." (let* (;; Handle the case of local files. `tramp-dissect-file-name' does ;; not raise an error anymore. - (path (if (tramp-tramp-file-p path) path (concat "/:" path))) + ;;(path (if (tramp-tramp-file-p path) path (concat "/-::" path))) (file-vec (or (ignore-errors (tramp-dissect-file-name path)) (tramp-dissect-file-name - (concat "/:" path) 1))) + (concat "/-::" path) 1))) (method (tramp-file-name-method file-vec)) (user (tramp-file-name-user file-vec)) (host (tramp-file-name-host file-vec)) + (domain (tramp-file-name-domain file-vec)) + (port (tramp-file-name-port file-vec)) (localname (expand-file-name (tramp-file-name-localname file-vec)))) - (when (string= system-name host) + (when (or (string= (system-name) host) + (string= "-" host)) (setq host nil)) (cond ;; remote directory -> sudo @@ -67,7 +70,7 @@ unless SUDO-USER is provided." (setq method "sudo" user sudo-user))) (replace-regexp-in-string "^/:/" "/" - (tramp-make-tramp-file-name method user host localname)))) + (tramp-make-tramp-file-name method domain user host port localname)))) (defun dired-toggle-sudo-find (fname) "Create a new buffer for file name FNAME." -- 2.22.0 value='committer'>committer
path: root/tests/guix-daemon.sh
AgeCommit message (Expand)Author
2023-04-21tests: Fix checks for expected failures....Addresses <https://issues.guix.gnu.org/62406>. With 'set -e', a return status inverted with '!' does not cause the shell to exit immediately. Instead use '&& false' to indicate an expected failure. * tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment-container.sh, tests/guix-environment.sh, tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh, tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh, tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh, tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh, tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with '... && false' or `test ! ...` as appropriate. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Eric Bavier
2022-10-22Remove now unnecessary uses of (guix grafts)....These modules would use (guix grafts) just to access '%graft?' and related bindings, which are now in (guix store). * gnu/ci.scm, guix/gexp.scm, guix/lint.scm, guix/scripts.scm, guix/scripts/archive.scm, guix/scripts/build.scm, guix/scripts/challenge.scm, guix/scripts/deploy.scm, guix/scripts/environment.scm, guix/scripts/home.scm, guix/scripts/pack.scm, guix/scripts/package.scm, guix/scripts/pull.scm, guix/scripts/size.scm, guix/scripts/system.scm, guix/scripts/weather.scm, tests/builders.scm, tests/channels.scm, tests/cpan.scm, tests/derivations.scm, tests/gexp.scm, tests/graph.scm, tests/guix-daemon.sh, tests/monads.scm, tests/pack.scm, tests/packages.scm, tests/profiles.scm, tests/system.scm: Remove #:use-module (guix grafts). Ludovic Courtès