Subject: bug#26495: closed (Re: bug#26495: [PATCH] cargo-build-system: Remove store reference.)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 14 Apr 2017 10:24:02 +0000

Your bug report

#26495: [PATCH] cargo-build-system: Remove store reference.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
26495: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=26495
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#26495: [PATCH] cargo-build-system: Remove store reference.
From: [email-masked] (Ludovic Courtès)
To: Mathieu Othacehe <[email-masked]>
Cc: [email-masked]
Date: Fri, 14 Apr 2017 12:23:22 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Mathieu Othacehe <[email-masked]> skribis:

> * guix/build/cargo-build-system.scm (generate-checksums): Remove store
>   reference from comment. This comment was matching
>   assert-no-store-file-names regexp in Makefile.am.
>   Also, edit procedure docstring to precise that DIR-NAME is a store
>   directory.

Applied, thanks!

Ludo’.

Subject: [PATCH] cargo-build-system: Remove store reference.
From: Mathieu Othacehe <[email-masked]>
To: [email-masked]
Cc: Mathieu Othacehe <[email-masked]>
Date: Fri, 14 Apr 2017 12:12:56 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

* guix/build/cargo-build-system.scm (generate-checksums): Remove store
  reference from comment. This comment was matching
  assert-no-store-file-names regexp in Makefile.am.
  Also, edit procedure docstring to precise that DIR-NAME is a store
  directory.
---
 guix/build/cargo-build-system.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index f11d85874..139b40321 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 David Craven <[email-masked]>
+;;; Copyright © 2017 Mathieu Othacehe <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -116,12 +117,12 @@ directory = '" port)
       (close-pipe port)
       result)))
 
-;; Example dir-name: "/gnu/store/hwlr49riz3la33m6in2n898ly045ylld-rust-rand-0.3.15".
 (define (generate-checksums dir-name src-name)
-  "Given DIR-NAME, checksum all the files in it one by one and put the
-   result into the file \".cargo-checksum.json\" in the same directory.
-   Also includes the checksum of an extra file SRC-NAME as if it was
-   part of the directory DIR-NAME with name \"package\"."
+  "Given DIR-NAME, a store directory, checksum all the files in it one
+by one and put the result into the file \".cargo-checksum.json\" in
+the same directory.  Also includes the checksum of an extra file
+SRC-NAME as if it was part of the directory DIR-NAME with name
+\"package\"."
   (let* ((file-names (find-files dir-name "."))
          (dir-prefix-name (string-append dir-name "/"))
          (dir-prefix-name-len (string-length dir-prefix-name))
-- 
2.12.2