[elpa] elpa-admin 29880d4 115/357: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa

[Stefan Monnier]

branch: elpa-admin
commit 29880d4d7c4b92019f2ba7d0b28f30e4a3be90dc
Merge: 170624f e38e391
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa
---
 admin/archive-contents.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 7ee9c1c..8019bf7 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -187,13 +187,17 @@ Otherwise, return nil."
                  (requires-str (lm-header "package-requires"))
                  (pt (lm-header "package-type"))
                  (simple (if pt (equal pt "simple") (= (length files) 1)))
+                 (keywords (lm-keywords-list))
                  (url (or (lm-header "url")
                           (format "http://elpa.gnu.org/packages/%s.html"; pkg)))
                  (req
                   (if requires-str
                       (mapcar 'archive--convert-require
                               (car (read-from-string requires-str))))))
-            (list simple version description req (list (cons :url url)))))))
+            (list simple version description req
+                  ;; extra parameters
+                  (list (cons :url url)
+                        (cons :keywords keywords)))))))
      ((not (file-exists-p pkg-file))
       (error "Can find single file nor package desc file in %s" dir)))))