bug#44650: Do not suggest `guix pull --news' after first pull

bug#44650: Do not suggest `guix pull --news' after first pull

[pelzflorian (Florian Pelz)]

[-- Attachment #1: Type: text/plain, Size: 1146 bytes --]

After doing a `guix pull` on the new VM image
<https://alpha.gnu.org/gnu/guix/guix-system-vm-image-1.2.0rc1.x86_64-linux.xz>,
the following is displayed:

> hint: Run `guix pull --news' to read all the news.
> 
> hint: After setting `PATH', run `hash guix' to make sure your shell refers to `/home/guest/.config/guix/current/bin/guix'.

The former `guix pull --news` is without effect (it is the very first
time I did a `guix pull`).  It is a no-op.  Users should not get the
suggestion to run `guix pull --news`.


Within (guix scripts pull)’ build-and-install procedure, the value of
(display-channel-news-headlines profile) is <unspecified>.

The attached patch changes it to return #f.  I have verified running
`guix pull --news' is not suggested anymore with it (although I have
not tested if news are still displayed).

It would perhaps be nicer if the news since version 1.2.0 were
displayed, but I do not know how to make it so.  I guess since the
original guix package must come from the guix package in (gnu packages
package-management), it is impossible to determine the version from
which news should be computed.

Regards,
Florian

[-- Attachment #2: 0001-pull-Do-not-suggest-running-guix-pull-news-on-the-fi.patch --]
[-- Type: text/plain, Size: 1413 bytes --]

From 8da37dc91f2f82da5f1da0ed2b6f0c0602599e5c Mon Sep 17 00:00:00 2001
From: Florian Pelz <pelzflorian@pelzflorian.de>
Date: Sat, 14 Nov 2020 23:36:52 +0100
Subject: [PATCH] pull: Do not suggest running `guix pull --news' on the first
 run.

* guix/scripts/pull.scm (display-channel-news-headlines): If there
are no news to display, return false instead of <unspecified>.
---
 guix/scripts/pull.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index bb1b560a22..38405fb79d 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -385,7 +385,7 @@ previous generation.  Return true if there are news to display."
     (and=> (relative-generation profile -1)
            (cut generation-file-name profile <>)))
 
-  (when previous
+  (if previous
     (let ((old-channels (profile-channels previous))
           (new-channels (profile-channels profile)))
       ;; Find the channels present in both PROFILE and PREVIOUS, and print
@@ -405,7 +405,8 @@ previous generation.  Return true if there are news to display."
                                                       #:concise? #t)))
                     channels))
 
-             (any ->bool more?))))))
+             (any ->bool more?))))
+    #f))
 
 (define (display-news profile)
   ;; Display profile news, with the understanding that this process represents
-- 
2.29.1

bug#44650: Do not suggest `guix pull --news' after first pull

[pelzflorian (Florian Pelz)]

[-- Attachment #1: Type: text/plain, Size: 788 bytes --]

On Sun, Nov 15, 2020 at 02:56:30AM +0100, pelzflorian (Florian Pelz) wrote:
> -  (when previous
> +  (if previous
>      (let ((old-channels (profile-channels previous))
>            (new-channels (profile-channels profile)))
>        ;; Find the channels present in both PROFILE and PREVIOUS, and print
> @@ -405,7 +405,8 @@ previous generation.  Return true if there are news to display."
>                                                        #:concise? #t)))
>                      channels))
>  
> -             (any ->bool more?))))))
> +             (any ->bool more?))))
> +    #f))

I changed the patch to use `and` instead of `if` (attached).  I
confirmed that channel news display fine on a later `guix pull`.

Should I add a copyright line?  I believe no.

Regards,
Florian

[-- Attachment #2: 0001-pull-Do-not-suggest-running-guix-pull-news-on-the-fi.patch --]
[-- Type: text/plain, Size: 1092 bytes --]

From 8b1557004f618a47d4bea3a65a5b88c4cb718c4c Mon Sep 17 00:00:00 2001
From: Florian Pelz <pelzflorian@pelzflorian.de>
Date: Sat, 14 Nov 2020 23:36:52 +0100
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH] pull: Do not suggest running `guix pull --news' on the first
 run.

* guix/scripts/pull.scm (display-channel-news-headlines): If there
are no news to display, return false instead of <unspecified>.
---
 guix/scripts/pull.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index bb1b560a22..7fd8b3f1a4 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -385,7 +385,7 @@ previous generation.  Return true if there are news to display."
     (and=> (relative-generation profile -1)
            (cut generation-file-name profile <>)))
 
-  (when previous
+  (and previous
     (let ((old-channels (profile-channels previous))
           (new-channels (profile-channels profile)))
       ;; Find the channels present in both PROFILE and PREVIOUS, and print
-- 
2.29.1

bug#44650: Do not suggest `guix pull --news' after first pull

[Ludovic Courtès]

Hi,

"pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> skribis:

> Should I add a copyright line?  I believe no.

Yeah, probably not.

> From 8b1557004f618a47d4bea3a65a5b88c4cb718c4c Mon Sep 17 00:00:00 2001
> From: Florian Pelz <pelzflorian@pelzflorian.de>
> Date: Sat, 14 Nov 2020 23:36:52 +0100
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> Subject: [PATCH] pull: Do not suggest running `guix pull --news' on the first
>  run.
>
> * guix/scripts/pull.scm (display-channel-news-headlines): If there
> are no news to display, return false instead of <unspecified>.

Perfect, you can push to ‘version-1.2.0’, thank you!

Ludo’.

bug#44650: Do not suggest `guix pull --news' after first pull

[pelzflorian (Florian Pelz)]

On Mon, Nov 16, 2020 at 12:35:08PM +0100, Ludovic Courtès wrote:
> Perfect, you can push to ‘version-1.2.0’, thank you!
> 
> Ludo’.

Thank you.  Pushed as 29ed17d6345d30b0646f0a9b63ab201e0e6871ec.  Done.

Regards,
Florian