[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/dired-duplicates c1dbfc5bcd 53/57: Improve error handli
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/dired-duplicates c1dbfc5bcd 53/57: Improve error handling of checksum program |
|
Date: |
Sat, 4 Nov 2023 06:58:31 -0400 (EDT) |
branch: externals/dired-duplicates
commit c1dbfc5bcd3c87fc42389ac63e2308ff21c674f2
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Harald Judt <h.judt@gmx.at>
Improve error handling of checksum program
Signed-off-by: Harald Judt <h.judt@gmx.at>
---
dired-duplicates.el | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/dired-duplicates.el b/dired-duplicates.el
index d886abcda3..ce6b7b21d2 100644
--- a/dired-duplicates.el
+++ b/dired-duplicates.el
@@ -98,14 +98,17 @@ return boolean t if the file matches a criteria, otherwise
nil."
The executable used is defined by `dired-duplicates-checksum-exec'."
(let* ((default-directory (file-name-directory (expand-file-name file)))
- (exec (executable-find dired-duplicates-checksum-exec t)))
+ (exec (executable-find dired-duplicates-checksum-exec t))
+ (file (expand-file-name (file-local-name file))))
(unless exec
- (user-error "Checksum program %s not found in exec-path" exec))
- (car (split-string
- (shell-command-to-string
- (concat exec " \"" (expand-file-name (file-local-name file)) "\""))
- nil
- t))))
+ (user-error "Checksum program %s not found in `exec-path'" exec))
+ (with-temp-buffer
+ (unless (zerop (call-process exec nil t nil file))
+ (error "Failed to start checksum program %s" exec))
+ (goto-char (point-min))
+ (if (looking-at "\\`[[:alnum:]]+")
+ (match-string 0)
+ (error "Unexpected output from checksum program %s" exec)))))
(defun dired-duplicates--apply-file-filter-functions (files)
"Apply file filter functions to FILES, returning the resulting list."
- [elpa] externals/dired-duplicates b4a7b0a3e7 38/57: Lower required emacs version to 27.1, (continued)
- [elpa] externals/dired-duplicates b4a7b0a3e7 38/57: Lower required emacs version to 27.1, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 31c1aa8880 40/57: Rename all occurrences of find-duplicates to dired-duplicates, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 6df828caac 41/57: README.org: Add more detailed explanations, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 887560b192 42/57: Get rid of separator files, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 4c17bcdcc0 43/57: Separate search results using empty lines, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 0a9a5d8b65 44/57: Make separating results optional again, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 4664aed213 46/57: Fix truncating directories when calling dired-duplicates non-interactively, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 94319f44f7 47/57: Improve checking parameters and handling parameter errors, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 3c16f56388 48/57: Install workarounds for Emacs Dired bug #57565, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates c6193334fd 50/57: Update copyright notice to point to the FSF, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates c1dbfc5bcd 53/57: Improve error handling of checksum program,
ELPA Syncer <=
- [elpa] externals/dired-duplicates b5a9eb1cc1 26/57: flymake: Fix warning about unused lexical variables, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 4fde2fbfa7 33/57: Fix first lines of docstrings, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 94542206f7 49/57: Update GPL3 LICENSE file, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 4cf9eeb365 54/57: Remove conditional checks that dolist does for free, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates ec0a89ca32 57/57: Remove commented line of code, ELPA Syncer, 2023/11/04
- [elpa] externals/dired-duplicates 4a18d41af4 56/57: Use use-local-map instead of setf current-local-map, ELPA Syncer, 2023/11/04