Update of /p/lispy/cvsroot/lispy In directory clnet:/tmp/cvs-serv21004

Modified Files: bootstrap.sh lispy.asd lispy.lisp utils.lisp Added Files: logging.lisp Log Message:

--- /p/lispy/cvsroot/lispy/bootstrap.sh 2008/01/27 20:19:57 1.5 +++ /p/lispy/cvsroot/lispy/bootstrap.sh 2008/02/04 14:42:42 1.6 @@ -36,7 +36,8 @@ salza-0.7.4.tar.gz split-sequence-2002-04-10.tar.gz trivial-gray-streams-2006-09-16.tar.gz -usocket-0.3.5.tar.gz' +usocket-0.3.5.tar.gz +log5_0.3.1.tar.gz'

TMP=`mktemp -d -t bootstrap.sh.XXXXXX` trap "rm -rf $TMP* 2>/dev/null" EXIT --- /p/lispy/cvsroot/lispy/lispy.asd 2007/07/23 14:25:57 1.5 +++ /p/lispy/cvsroot/lispy/lispy.asd 2008/02/04 14:42:42 1.6 @@ -7,6 +7,7 @@

(defsystem #:lispy :components ((:file "packages") + (:file "logging") (:file "utils") (:file "specials") (:file "lispy")) @@ -16,7 +17,8 @@ #:gzip-stream #:archive #:ironclad - #:cl-fad)) + #:cl-fad + #:log5))

(defmethod perform :after ((o load-op) (c (eql (find-system 'lispy)))) (let ((lispy-config (merge-pathnames #p".lispy.lisp"(user-homedir-pathname)))) --- /p/lispy/cvsroot/lispy/lispy.lisp 2008/01/27 19:54:07 1.11 +++ /p/lispy/cvsroot/lispy/lispy.lisp 2008/02/04 14:42:42 1.12 @@ -47,7 +47,7 @@ (labels ((dependencies-of (name) (push (module-by-name name) dependencies) (let ((m (module-by-name name))) - (if m + (if m (dolist (d (dependencies (latest-version m))) (dependencies-of d)) (error "No such module ~A found in map." name))))) @@ -107,7 +107,7 @@ (unwind-protect (dolist (module (mapcar #'(lambda (m) (parse-module m map-url)) - (read stream))) + (read-stream stream))) (setf (gethash (name module) *lispy-map*) module)) (close stream)))) @@ -177,7 +177,7 @@ (with-open-file (stream *lispy-installation-pathname* :direction :input :if-does-not-exist :create) - (dolist (install (mapcar #'parse-install (read stream nil nil))) + (dolist (install (mapcar #'parse-install (read-stream stream nil nil))) (setf (gethash (name install) *lispy-installation*) install))) (log-message "read-installation" "Map contains ~A entr~:@p" (hash-table-count *lispy-installation*)) --- /p/lispy/cvsroot/lispy/utils.lisp 2007/07/23 14:25:58 1.4 +++ /p/lispy/cvsroot/lispy/utils.lisp 2008/02/04 14:42:42 1.5 @@ -23,6 +23,7 @@ (let ((archive (archive:open-archive 'archive:tar-archive stream))) (unwind-protect (archive:do-archive-entries (entry archive) + (log-message 'extract-archive (archive:name entry)) (when (archive:entry-regular-file-p entry) (extract-entry entry target-directory-pathname))) (close stream))))) @@ -48,3 +49,7 @@ (defmacro define-constant (name value &optional doc) `(defconstant ,name (if (boundp ',name) (symbol-value ',name) ,value) ,@(when doc (list doc)))) + +(defun read-stream (stream &rest args) + (let ((*read-eval* nil)) + (apply #'read stream args)))

--- /p/lispy/cvsroot/lispy/logging.lisp 2008/02/04 14:42:43 NONE +++ /p/lispy/cvsroot/lispy/logging.lisp 2008/02/04 14:42:43 1.1

(in-package #:lispy)

(log5:defcategory install) (log5:defcategory uninstall) (log5:defcategory upgrade)