Merge slashes-in-manifest branch

Author: xach

quicklisp/client.lisp

@@ -95,10 +95,8 @@ in order of descending QL-DIST:PREFERENCE."
                           :direction :output
                           :if-exists if-exists)
     (with-consistent-dists
-      ;; FIXME: Should avoid emitting lines for systems with system
-      ;; files with a pathname-name that does not match the system
-      ;; name. They're not normally loadable anyway.
-      (let ((systems (provided-systems t)))
+      (let ((systems (provided-systems t))
+            (already-seen (make-hash-table :test 'equal)))
         (dolist (system (sort systems #'>
                               :key #'preference))
           ;; FIXME: find-asdf-system-file does another find-system
@@ -108,7 +106,8 @@ in order of descending QL-DIST:PREFERENCE."
                  (enough (and system-file (enough-namestring system-file
                                                              output-file)))
                  (native (and enough (native-namestring enough))))
-            (when native
+            (when (and native (not (gethash native already-seen)))
+              (setf (gethash native already-seen) native)
               (format stream "~A~%" native)))))))
   (probe-file output-file))
 

quicklisp/dist.lisp

@@ -605,13 +605,22 @@ the given NAME."
    "Instances of this class have a special location for their
    preference files."))
 
+(defgeneric filesystem-name (object)
+  (:method (object)
+    ;; This is to work around system names like "foo/bar".
+    (let* ((name (name object))
+           (slash (position #\/ name)))
+      (if slash
+          (subseq name 0 slash)
+          name))))
+
 (defmethod preference-file ((object preference-mixin))
   (relative-to
    (dist object)
    (make-pathname :directory (list :relative
                                    "preferences"
                                    (metadata-name object))
-                              :name (name object)
+                              :name (filesystem-name object)
                               :type "txt")))
 
 (defmethod distinfo-subscription-url :around ((dist dist))