From 79bcac46054b8923b163c17167b77ee9a21be988 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sat, 2 Apr 2022 14:15:44 -0700
Subject: rename RUN-FAILED accessors

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
---
 src/connection.lisp         | 16 ++++++++--------
 src/package.lisp            |  8 ++++----
 src/property/firewalld.lisp |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/connection.lisp b/src/connection.lisp
index 2253e08..7db2413 100644
--- a/src/connection.lisp
+++ b/src/connection.lisp
@@ -267,18 +267,18 @@ login(1)).  Tilde expansion works correctly."
 ;; their corresponding implementation of CONNECTION-RUN).
 
 (define-condition run-failed (error)
-  ((cmd :initarg :cmd :reader failed-cmd)
-   (stdout :initarg :stdout :reader failed-stdout)
-   (stderr :initarg :stderr :reader failed-stderr)
-   (exit-code :initarg :exit-code :reader failed-exit-code))
+  ((cmd :initarg :cmd :reader run-failed-cmd)
+   (stdout :initarg :stdout :reader run-failed-stdout)
+   (stderr :initarg :stderr :reader run-failed-stderr)
+   (exit-code :initarg :exit-code :reader run-failed-exit))
   (:report (lambda (condition stream)
              (format
               stream
               "~&'~A' failed, exit code ~A~%~%stderr was:~%~A~&~%stdout:~%~A"
-              (failed-cmd condition)
-              (failed-exit-code condition)
-              (failed-stderr condition)
-              (failed-stdout condition)))))
+              (run-failed-cmd condition)
+              (run-failed-exit condition)
+              (run-failed-stderr condition)
+              (run-failed-stdout condition)))))
 
 (defmacro with-remote-temporary-file ((file
                                        &key
diff --git a/src/package.lisp b/src/package.lisp
index 77d3295..b2b66f0 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -172,10 +172,10 @@
            #:mktemp
            #:with-remote-current-directory
            #:run-failed
-           #:failed-cmd
-           #:failed-stdout
-           #:failed-stderr
-           #:failed-exit-code
+           #:run-failed-cmd
+           #:run-failed-stdout
+           #:run-failed-stderr
+           #:run-failed-exit
            #:runlines
            #:remote-test
            #:remote-exists-p
diff --git a/src/property/firewalld.lisp b/src/property/firewalld.lisp
index 6c6f337..8d0835c 100644
--- a/src/property/firewalld.lisp
+++ b/src/property/firewalld.lisp
@@ -67,7 +67,7 @@
                        ((run-failed
                           (lambda (c)
                             (when (and warning
-                                       (search warning (failed-stdout c)))
+                                       (search warning (run-failed-stdout c)))
                               (return-from permanent-change :no-change)))))
                      (apply #'mrun "firewall-offline-cmd" offline-apply))
                    (if --permanent
-- 
cgit v1.2.3