* bug#26495: [PATCH] cargo-build-system: Remove store reference.
@ 2017-04-14 10:12 Mathieu Othacehe
2017-04-14 10:23 ` Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Mathieu Othacehe @ 2017-04-14 10:12 UTC (permalink / raw)
To: 26495
* 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 <david@craven.ch>
+;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#26495: [PATCH] cargo-build-system: Remove store reference.
2017-04-14 10:12 bug#26495: [PATCH] cargo-build-system: Remove store reference Mathieu Othacehe
@ 2017-04-14 10:23 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2017-04-14 10:23 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 26495-done
Mathieu Othacehe <m.othacehe@gmail.com> 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’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-14 10:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-14 10:12 bug#26495: [PATCH] cargo-build-system: Remove store reference Mathieu Othacehe
2017-04-14 10:23 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).