diff --git a/doc/asdf.texinfo b/doc/asdf.texinfo index d6029e90b82129f60bb64bf3360ee9f3523e6a76..997c89e38b878c3f95cf768020c1b30e0267125d 100644 --- a/doc/asdf.texinfo +++ b/doc/asdf.texinfo @@ -1728,8 +1728,9 @@ is forced not to be recompiled even if modified since last compilation, but other systems are not affected. If @var{force-not} is a list, then it specifies a list of systems that are forced not to be recompiled even if modified since last compilation. -@var{force} takes precedences over @var{force-not}; -both of them apply to systems that are dependencies and were already compiled. +@var{force-not} takes precedences over @var{force}, +as it should, really, but unhappily only since 3.1.1. +Both apply to systems that are dependencies and were already compiled. To see what @code{operate} would do, you can use: @example diff --git a/plan.lisp b/plan.lisp index 2d84d6bb6d9ce1bfe8763c1490fd57cefc89c2e4..593e98a0598abb475d1282cc8fc0ec3887c67c7f 100644 --- a/plan.lisp +++ b/plan.lisp @@ -122,11 +122,9 @@ the action of OPERATION on COMPONENT in the PLAN")) (not (eq system (plan-system plan)))))))) (defmethod action-forced-not-p (plan operation component) - (and - ;; Did the user ask us to not re-perform the action? - (action-override-p plan operation component 'plan-forced-not) - ;; Force takes precedence over force-not - (not (action-forced-p plan operation component)))) + ;; Did the user ask us to not re-perform the action? + ;; NB: force-not takes precedence over force, as it should + (action-override-p plan operation component 'plan-forced-not)) (defmethod action-forced-p ((plan null) (operation operation) (component component)) nil) diff --git a/test/test-force.script b/test/test-force.script index 59a5b294b1a172333433ec778e2467014709b520..5cad8f6c891dea3490194ea358e0c1b2001e9eae 100644 --- a/test/test-force.script +++ b/test/test-force.script @@ -10,6 +10,11 @@ (assert file1) (assert file1-date) +;; Check that force has some effect, but force-not takes precedence. +(assert (traverse 'load-op 'test-force :force t)) +(assert (null (traverse 'load-op 'test-force :force-not t))) +(assert (null (traverse 'load-op 'test-force :force t :force-not t))) + ;; unforced, date should stay same (touch-file "test-force.asd" :timestamp date1) (touch-file "file1.lisp" :timestamp date1)