[nongnu] elpa-admin c943660 310/439: Merge commit '98405112baa5ce2a118d1c65184c005d8ddaa1a9'

[Philip Kaludercic]

branch: elpa-admin
commit c943660b863ba37a569593f5b7a93a716c603363
Merge: 21c69f7 75bab1c
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    Merge commit '98405112baa5ce2a118d1c65184c005d8ddaa1a9'
---
 admin/archive-contents.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 32f5285..3024543 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -41,8 +41,10 @@
       l)))
 
 (defun archive--convert-require (elt)
-  (list (car elt)
-       (archive--version-to-list (car (cdr elt)))))
+  (let ((vers (archive--version-to-list (car (cdr elt)))))
+    (if vers
+        (list (car elt) vers)
+      (list (car elt)))))
 
 (defun archive--dirname (dir &optional base)
   (file-name-as-directory (expand-file-name dir base)))
@@ -200,7 +202,7 @@ PKG is the name of the package and DIR is the directory 
where it is."
                           (format archive-default-url-format pkg)))
                  (req
                   (and requires-str
-                       (mapcar 'archive--convert-require
+                       (mapcar #'archive--convert-require
                                (car (read-from-string requires-str))))))
             (list simple version description req
                   ;; extra parameters
@@ -292,7 +294,7 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
   (let* ((exp (archive--multi-file-package-def dir pkg))
         (vers (nth 2 exp))
          (req-exp (nth 4 exp))
-        (req (mapcar 'archive--convert-require
+        (req (mapcar #'archive--convert-require
                       (if (eq 'quote (car-safe req-exp)) (nth 1 req-exp)
                         (when req-exp
                           (error "REQ should be a quoted constant: %S"