(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)
DB6P18901MB002290D26A0CEE6A0BF33D3ADBA70@DB6P18901MB0022.EURP189.PROD.OUTLOOK.COM
Hi Guix Team,
First contribution to Guix project so i hope i forgot nothing in the process to submit my patch.
There is already some patchs for "t/t9100-git-svn-basic.sh" and "t/t9300-fast-import.sh" but they
assume than the store is always "/gnu/store".
The bellow patch is intend to correct this and lets the check phase work the same way if a custom
store is used.
Best regards,
From 08b8d3b9d32bd7f3f5b762541f38f95a2eb63c2a Mon Sep 17 00:00:00 2001
From: RockAndSka <yoann_mac_donald@hotmail.com>
Date: Sun, 1 Apr 2018 16:11:30 +0200
Subject: [PATCH] gnu: git: Fix checksum patch in 'patch-tests'.
* gnu/packages/version-control.scm (git)[arguments]: In 'patch-tests'
phase, use %store-directory instead of '/gnu' to prevent tests failure
in case a custom store path is used.
---
gnu/packages/version-control.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Toggle diff (20 lines)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index ba985f6..60a509e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -238,10 +238,10 @@ as well as the classic centralized workflow.")
(("\tcommit_template_commented") "\ttrue"))
;; More checksum mismatches due to odd shebangs.
(substitute* "t/t9100-git-svn-basic.sh"
- (("\"#!/gnu.*/bin/sh") "\"#!/bin/sh"))
+ (((string-append "\"#!" (%store-directory) ".*/bin/sh")) "\"#!/bin/sh") )
(substitute* "t/t9300-fast-import.sh"
- (("\t#!/gnu.*/bin/sh") "\t#!/bin/sh")
- (("'#!/gnu.*/bin/sh") "'#!/bin/sh"))
+ (((string-append "\t#!" (%store-directory) ".*/bin/sh")) "\t#!/bin/sh")
+ (((string-append "'#!" (%store-directory) ".*/bin/sh")) "'#!/bin/sh"))
;; FIXME: Some hooks fail with "basename: command not found".
;; See 't/trash directory.t9164.../svn-hook.log'.
(delete-file "t/t9164-git-svn-dcommit-concurrent.sh")
--
2.7.4