Browse files

Simplify the check for whether cl-postgres glue is to be loaded

Apparently, ASDF2's asdf:operation-done-p returns true in situations where
I wouldn't expect it to. This was causing the glue to be loaded twice.
  • Loading branch information...
1 parent dfb9da1 commit f35a1124476d39d651baddbe1ba67917f1149833 @marijnh committed Aug 12, 2011
Showing with 4 additions and 8 deletions.
  1. +2 −4 cl-postgres.asd
  2. +2 −4 simple-date.asd
@@ -38,7 +38,5 @@
(funcall (intern (string :run!) (string :Eos)) :cl-postgres))
(defmethod perform :after ((op asdf:load-op) (system (eql (find-system :cl-postgres))))
- (let ((simple-date (asdf:find-system :simple-date nil)))
- (when (and simple-date
- (asdf:operation-done-p (make-instance 'asdf:load-op) simple-date))
- (asdf:oos 'asdf:load-op :simple-date-postgres-glue))))
+ (when (find-package :simple-date)
+ (asdf:oos 'asdf:load-op :simple-date-postgres-glue)))
@@ -25,7 +25,5 @@
(funcall (intern (string :run!) (string :Eos)) :simple-date))
(defmethod perform :after ((op asdf:load-op) (system (eql (find-system :simple-date))))
- (let ((cl-postgres (asdf:find-system :cl-postgres nil)))
- (when (and cl-postgres
- (asdf:operation-done-p (make-instance 'asdf:load-op) cl-postgres))
- (asdf:oos 'asdf:load-op :simple-date-postgres-glue))))
+ (when (find-package :cl-postgres)
+ (asdf:oos 'asdf:load-op :simple-date-postgres-glue)))

0 comments on commit f35a112

Please sign in to comment.