[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#31016] [PATCH] gnu: git: Fix checksum patch in 'patch-tests'.

Subject: [bug#31016] [PATCH] gnu: git: Fix checksum patch in 'patch-tests'.
Date: Sun, 1 Apr 2018 15:03:12 +0000

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/" and 
"t/" 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 <address@hidden>
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(-)

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/"
-              (("\"#!/gnu.*/bin/sh") "\"#!/bin/sh"))
+              (((string-append "\"#!" (%store-directory) ".*/bin/sh")) 
"\"#!/bin/sh") )
             (substitute* "t/"
-              (("\t#!/gnu.*/bin/sh") "\t#!/bin/sh")
-              (("'#!/gnu.*/bin/sh") "'#!/bin/sh"))
+              (((string-append "\t#!" (%store-directory) ".*/bin/sh")) 
+              (((string-append "'#!" (%store-directory) ".*/bin/sh")) 
             ;; FIXME: Some hooks fail with "basename: command not found".
             ;; See 't/trash directory.t9164.../svn-hook.log'.
             (delete-file "t/")

reply via email to

[Prev in Thread] Current Thread [Next in Thread]