emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] elpa-admin de36b862c8: * elpa-admin.el: Tweak the formatting of s


From: Stefan Monnier
Subject: [elpa] elpa-admin de36b862c8: * elpa-admin.el: Tweak the formatting of some messages
Date: Thu, 24 Nov 2022 13:18:37 -0500 (EST)

branch: elpa-admin
commit de36b862c821372cf970236228113143a43d8163
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * elpa-admin.el: Tweak the formatting of some messages
    
    (elpaa--check-sync-failures, elpaa--report-build-failure):
    Tweak the text of the email message.
    (elpaa--fetch): Make the stdout a bit more compact.
---
 elpa-admin.el | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 798577a748..6ebc29a719 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -693,7 +693,7 @@ with the following commands:
 Of course, feel free to undo the changes it may introduce in the file
 contents: we only need the metadata to indicate that this code was merged.
 
-You can consult the latest error output
+You can consult the latest error output in
 [the sync-failure file](%s%s)."
              elpaa--gitrepo elpaa--gitrepo
              elpaa--branch-prefix pkg
@@ -713,18 +713,19 @@ You can consult the latest error output
       "The build scripts failed to build the tarball
 for version %s of the package %s.
 You can consult the latest error output in the file
-%S in the corresponding ELPA archive web site.
+%S in the %s ELPA archive web site.
 
 You can also try and reproduce the error locally as follows:
 
     git clone --single-branch git://git.sv.gnu.org/%s
     cd %s
-    make                # Setup the infrastructure
-    make packages/%s    # Create a worktree of the package
-    make build/%s       # Build the tarballs into archive/ and archive-devel/"
-      version pkg basename
+    make %s           # Setup the infrastructure
+    make packages/%s  # Create a worktree of the package
+    make build/%s     # Build the tarballs into archive(-devel)/"
+      version pkg basename elpaa--name
       elpaa--gitrepo
       (file-name-sans-extension (file-name-nondirectory elpaa--gitrepo))
+      (make-string (string-width (format "%s" pkg)) ?\s)
       pkg pkg))))
 
 (defun elpaa--make-one-tarball ( tarball dir pkg-spec metadata-or-version
@@ -2650,10 +2651,11 @@ relative to elpa root."
           (message "Nothing new upstream for %s" pkg))
          ((not (or (elpaa--is-ancestor ortb urtb)
                    (elpaa--spec-get pkg-spec :merge)))
-          (message "%s" (delete-and-extract-region (point-min) (point-max)))
-          (let* ((msg (format "Upstream of %s has DIVERGED!\n\n" pkg)))
+          (let ((output (delete-and-extract-region (point-min) (point-max))))
+            (if (> (length output) 0) (message "%s" output)))
+          (let* ((msg (format "Upstream of %s has DIVERGED!" pkg)))
             (when (or show-diverged (eq k #'elpaa--push))
-              (let ((msgs (list msg)))
+              (let ((msgs (list "\n\n" msg)))
                 (elpaa--call t "git" "log"
                              "--format=%h  %<(16,trunc)%ae  %s"
                              (format "%s..%s" urtb ortb))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]