GNU bug report logs - #38781
[PATCH core-updates] build-system/gnu: Make 'first-subdirectory' optional.

Previous Next

Package: guix-patches;

Reported by: Danny Milosavljevic <dannym <at> scratchpost.org>

Date: Sat, 28 Dec 2019 21:47:01 UTC

Severity: normal

Tags: moreinfo, patch

Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 38781 <at> debbugs.gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [bug#38781] [PATCH core-updates] build-system/gnu: Make 'first-subdirectory' optional.
Date: Sat, 28 Dec 2019 22:46:22 +0100

* guix/build/gnu-build-system.scm (unpack): Make 'first-subdirectory'
optional.
---
 guix/build/gnu-build-system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 4df0bb4904..4ebaa455b0 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -160,7 +160,7 @@ working directory."
         (if (string-suffix? ".zip" source)
             (invoke "unzip" source)
             (invoke "tar" "xvf" source))
-        (chdir (first-subdirectory "."))))
+        (chdir (or (first-subdirectory ".") "."))))
   #t)
 
 (define %bootstrap-scripts
This bug report was last modified 1 year and 213 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.