FILE:HAS-CONTENT: don't return :NO-CHANGE if file mode was changed

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

3 files changed, 14 insertions, 1 deletions

diff --git a/src/package.lisp b/src/package.lisp
index 345f928..4c8e442 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -136,6 +136,7 @@
            #:call-with-os
            #:with-change-if-changes-file
            #:with-change-if-changes-file-content
+           #:with-change-if-changes-file-content-or-mode
 
            ;; propspec.lisp
            #:in-consfig
diff --git a/src/property.lisp b/src/property.lisp
index a223ff8..8246af5 100644
--- a/src/property.lisp
+++ b/src/property.lisp
@@ -527,3 +527,15 @@ changes in properties which will change the file but not the output of `ls
             (result (progn ,@forms)))
        (if (and ,before (eql ,before (cksum ,file)))
            :no-change result))))
+
+(defmacro with-change-if-changes-file-content-or-mode ((file) &body forms)
+  "Execute FORMS and yield :NO-CHANGE if FILE has the same content and mode
+afterwards."
+  (with-gensyms (before)
+    `(let* ((,before (ls-cksum ,file))
+            (result (progn ,@forms)))
+       (let ((after (ls-cksum ,file)))
+         (if (and ,before
+                  (string= (car ,before) (car after) :start1 1 :start2 1)
+                  (eql (cadr ,before) (cadr after)))
+             :no-change result)))))
diff --git a/src/property/file.lisp b/src/property/file.lisp
index aaa3944..e42df20 100644
--- a/src/property/file.lisp
+++ b/src/property/file.lisp
@@ -35,7 +35,7 @@ CONTENT can be a list of lines or a single string."
   (declare (indent 1))
   (:desc (declare (ignore content mode mode-supplied-p))
          #?"${path} has defined content")
-  (:apply (with-change-if-changes-file-content (path)
+  (:apply (with-change-if-changes-file-content-or-mode (path)
             (let ((args (list path
                               (etypecase content
                                 (cons (unlines content))