aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Höfling <bjoern.hoefling@bjoernhoefling.de>2018-11-23 18:38:27 +0100
committerBjörn Höfling <bjoern.hoefling@bjoernhoefling.de>2018-12-03 12:29:08 +0100
commitb8ca5b3146f94785c4e54ade1f64dc783a9b1a85 (patch)
treec36898cd5c2df7cf50a2ac6d98a1b8d0d61b3a4a
parenta03894416e6d2b4b017129d280c4ce83409c622d (diff)
downloadguix-b8ca5b3146f94785c4e54ade1f64dc783a9b1a85.tar
guix-b8ca5b3146f94785c4e54ade1f64dc783a9b1a85.tar.gz
hg-fetch: Remove .hg directories of sub-repositories.
* guix/build/hg.scm (hg-fetch): Remove all .hg directories recursively.
-rw-r--r--guix/build/hg.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/build/hg.scm b/guix/build/hg.scm
index ea51eb670b..b3e3ff7ac3 100644
--- a/guix/build/hg.scm
+++ b/guix/build/hg.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -45,8 +46,10 @@ Mercurial changeset identifier. Return #t on success, #f otherwise."
;; The contents of '.hg' vary as a function of the current
;; status of the Mercurial repo. Since we want a fixed
;; output, this directory needs to be taken out.
- (with-directory-excursion directory
- (delete-file-recursively ".hg"))
+ ;; Since the '.hg' file is also in sub-modules, we have to
+ ;; search for it in all sub-directories.
+ (for-each delete-file-recursively
+ (find-files directory "^\\.hg$" #:directories? #t))
#t)