[elpa] elpa-admin 1325337 262/357: [admin int] Simplify ‘archive-gitignore-externals’.

[Stefan Monnier]

branch: elpa-admin
commit 1325337db43b98d79439728e75520d89e501df53
Author: Thien-Thi Nguyen <ttn@gnu.org>
Commit: Thien-Thi Nguyen <ttn@gnu.org>

    [admin int] Simplify ‘archive-gitignore-externals’.
    
    * admin/archive-contents.el (archive-gitignore-externals):
    Use one pass over the externals-list file contents,
    instead of four, to collect core and external package names.
---
 admin/archive-contents.el | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 66ea520..4cdc5f1 100755
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -1,6 +1,6 @@
 ;;; archive-contents.el --- Auto-generate an Emacs Lisp package archive.  -*- 
lexical-binding:t -*-
 
-;; Copyright (C) 2011-2016  Free Software Foundation, Inc
+;; Copyright (C) 2011-2017  Free Software Foundation, Inc
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 
@@ -803,15 +803,10 @@ If WITH-CORE is non-nil, it means we manage :core 
packages as well."
 ;;; Manage .gitignore
 
 (defun archive-gitignore-externals (elf gf)
-  (let* ((el (read (find-file-noselect elf)))
-         (exts (delq nil
-                     (mapcar (lambda (x)
-                               (if (eq :external (nth 1 x)) (car x)))
-                             el)))
-         (core (delq nil
-                     (mapcar (lambda (x)
-                               (if (eq :core (nth 1 x)) (car x)))
-                             el))))
+  (let ((pkgs (cl-loop
+               for (name kind . _) in (read (find-file-noselect elf))
+               when (memq kind '(:external :core))
+               collect name)))
     (with-current-buffer (find-file-noselect gf)
       (goto-char (point-min))
       (when (re-search-forward
@@ -820,7 +815,7 @@ If WITH-CORE is non-nil, it means we manage :core packages 
as well."
         (replace-match ""))
       (insert "# External packages with their own .git tree [autogenerated].\n"
               (mapconcat (lambda (p) (format "packages/%s/\n" p))
-                         (sort (append exts core) #'string<)
+                         (sort pkgs #'string<)
                          ""))
       (save-buffer))))