diff mbox series

[bug#34625] Documentation: Update `guix challenge` diffing

Message ID 20190223012931.GA17575@z.z
State Accepted
Headers show
Series [bug#34625] Documentation: Update `guix challenge` diffing | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

mikadoZero Feb. 23, 2019, 1:29 a.m. UTC 
Attached is a patch that updates the manual sections `Invoking guix challenge` and `Invoking guix archive`.  The update involves changing a command in both sections to one that I verified worked as part of my submission of `guix challenge` diffs for bug#34597.  The commands that are replaces did not work for me.  There is also a cross reference added to the `Invoking guix challenge` in the relevant part of `Invoking guix archive`.

Comments

Ludovic Courtès April 17, 2020, 8:57 p.m. UTC | #1 
Hi!

mikadoZero <mikadozero@yandex.com> skribis:

>>From ea59d81de86fd5179eebf9782fbe66213ed59397 Mon Sep 17 00:00:00 2001
> From: mikadoZero <mikadozero@yandex.com>
> Date: Fri, 22 Feb 2019 18:24:20 -0500
> Subject: [PATCH] Documentation: Update `guix challenge` diffing.
>
> Add /gzip/ part into url which has the benefit of matching the output of
> `guix challenge`.  Change the commands to include gunzip in the pipeline as
> they are working on gzipped files.  Add reference to `guix challenge` in `guix
> archive` section where talking about challenging.

I changed the 2nd example to /lzip, adjusted the commit log to match our
conventions, and applied.

Thanks!

Ludo’.
diff mbox series

Patch

From ea59d81de86fd5179eebf9782fbe66213ed59397 Mon Sep 17 00:00:00 2001
From: mikadoZero <mikadozero@yandex.com>
Date: Fri, 22 Feb 2019 18:24:20 -0500
Subject: [PATCH] Documentation: Update `guix challenge` diffing.

Add /gzip/ part into url which has the benefit of matching the output of
`guix challenge`.  Change the commands to include gunzip in the pipeline as
they are working on gzipped files.  Add reference to `guix challenge` in `guix
archive` section where talking about challenging.
---
 doc/guix.texi | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 9fb5cff06..43c12cd72 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -58,6 +58,7 @@  Copyright @copyright{} 2018 Gábor Boskovits@*
 Copyright @copyright{} 2018 Florian Pelz@*
 Copyright @copyright{} 2018 Laura Lazzati@*
 Copyright @copyright{} 2018 Alex Vong@*
+Copyright @copyright{} 2019 mikadoZero@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -4204,8 +4205,8 @@  served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}:
 
 @example
 $ wget -O - \
-  https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-emacs-24.5 \
-  | bunzip2 | guix archive -x /tmp/emacs
+  https://@value{SUBSTITUTE-SERVER}/nar/gzip/@dots{}-emacs-24.5 \
+  | gunzip | guix archive -x /tmp/emacs
 @end example
 
 Single-item archives are different from multiple-item archives produced
@@ -4215,7 +4216,8 @@  and they do @emph{not} embed a signature.  Thus this operation does
 unsafe.
 
 The primary purpose of this operation is to facilitate inspection of
-archive contents coming from possibly untrusted substitute servers.
+archive contents coming from possibly untrusted substitute servers
+(@pxref{Invoking guix challenge}).
 
 @end table
 
@@ -9559,8 +9561,8 @@  To find out what is wrong with this Git binary, we can do something along
 these lines (@pxref{Invoking guix archive}):
 
 @example
-$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0 \
-   | guix archive -x /tmp/git
+$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/gzip/@dots{}-git-2.5.0 \
+   | gunzip | guix archive -x /tmp/git
 $ diff -ur --no-dereference /gnu/store/@dots{}-git.2.5.0 /tmp/git
 @end example
 
-- 
2.20.1