unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 039912d9533343ad70329c0068a24675ffa6680a 943 bytes (raw)
name: gnu/packages/patches/rnp-fix-cp.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
 
From c163e1b12511e9e7df752a01767a2a8ba56c4196 Mon Sep 17 00:00:00 2001
From: Justus Winter <teythoon@avior.uberspace.de>
Date: Tue, 21 Jul 2020 15:52:37 +0200
Subject: [PATCH 1/6] Make copying more robust.

Let the shell locate 'cp'.  This is more robust in environments such
as Guix or Nix that do not provide /bin/cp.
---
 src/tests/support.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/support.cpp b/src/tests/support.cpp
index 3d6a6dc9..d260e166 100644
--- a/src/tests/support.cpp
+++ b/src/tests/support.cpp
@@ -283,7 +283,7 @@ copy_recursively(const char *src, const char *dst)
     // TODO: maybe use fts or something less hacky
     char buf[2048];
 #ifndef _WIN32
-    snprintf(buf, sizeof(buf), "/bin/cp -a '%s' '%s'", src, dst);
+    snprintf(buf, sizeof(buf), "cp -a '%s' '%s'", src, dst);
 #else
     snprintf(buf, sizeof(buf), "xcopy \"%s\" \"%s\" /I /Q /E /Y", src, dst);
 #endif
-- 
2.20.1


debug log:

solving 039912d953 ...
found 039912d953 in https://yhetil.org/guix-patches/20200723120322.8385-3-justus@sequoia-pgp.org/

applying [1/1] https://yhetil.org/guix-patches/20200723120322.8385-3-justus@sequoia-pgp.org/
diff --git a/gnu/packages/patches/rnp-fix-cp.patch b/gnu/packages/patches/rnp-fix-cp.patch
new file mode 100644
index 0000000000..039912d953

1:31: trailing whitespace.
-- 
Checking patch gnu/packages/patches/rnp-fix-cp.patch...
1:33: new blank line at EOF.
+
Applied patch gnu/packages/patches/rnp-fix-cp.patch cleanly.
warning: 2 lines add whitespace errors.

index at:
100644 039912d9533343ad70329c0068a24675ffa6680a	gnu/packages/patches/rnp-fix-cp.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

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).