aboutsummaryrefslogtreecommitdiff
path: root/src/property/installer.lisp
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-07-10 18:56:45 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-07-10 21:49:23 -0700
commit102214763c91bb4b4f75bccd28f0e481f5eed8f8 (patch)
tree3daa93cd3c07394f606034e6b9f63224773d9a7e /src/property/installer.lisp
parenta02892983cd88a0f4e9b451d0765f6e279fabab1 (diff)
downloadconsfigurator-102214763c91bb4b4f75bccd28f0e481f5eed8f8.tar.gz
INSTALLER:CLEANLY-INSTALLED-ONCE: error when new-os DEST exists
This should not happen. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/installer.lisp')
-rw-r--r--src/property/installer.lisp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/property/installer.lisp b/src/property/installer.lisp
index 097caef..72119a0 100644
--- a/src/property/installer.lisp
+++ b/src/property/installer.lisp
@@ -244,9 +244,10 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE."
(rename file (chroot-pathname file old-os))))
(dolist (file (directory-contents new-os))
(let ((dest (in-chroot-pathname file new-os)))
- (unless (or (preservedp dest)
- (file-exists-p dest)
- (directory-exists-p dest))
+ (unless (preservedp dest)
+ (when (or (file-exists-p dest) (directory-exists-p dest))
+ (failed-change
+ "~A already exists in root directory." dest))
(rename file dest)))))
(serious-condition (c)
;; Make a single attempt to undo the moves to increase the chance