unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed

blob 50807e2b781ed48b4480693c908775b4c0fc06a0 572 bytes (raw)
name: gnu/packages/patches/multiqc-fix-git-subprocess-error.patch 	 # note: path name is non-authoritative(*)

Without this patch, the incorrect exception is caught when 'git' is not in PATH.

diff --git a/multiqc/utils/config.py b/multiqc/utils/config.py
index 01fa554..4a11793 100755
--- a/multiqc/utils/config.py
+++ b/multiqc/utils/config.py
@@ -28,7 +28,7 @@ try:
     git_hash = subprocess.check_output(['git', 'rev-parse', 'HEAD'], stderr=subprocess.STDOUT)
     git_hash_short = git_hash[:7]
     version = '{} ({})'.format(version, git_hash_short)
-except subprocess.CalledProcessError:
+except (subprocess.CalledProcessError, FileNotFoundError):
     pass
 os.chdir(cwd)
 

debug log:

solving 50807e2b7 ...
found 50807e2b7 in https://yhetil.org/guix-devel/f2f8fd5c-d739-b1fb-2251-1a615101e16a@uq.edu.au/

applying [1/1] https://yhetil.org/guix-devel/f2f8fd5c-d739-b1fb-2251-1a615101e16a@uq.edu.au/
diff --git a/gnu/packages/patches/multiqc-fix-git-subprocess-error.patch b/gnu/packages/patches/multiqc-fix-git-subprocess-error.patch
new file mode 100644
index 000000000..50807e2b7

1:21: trailing whitespace.
 
Checking patch gnu/packages/patches/multiqc-fix-git-subprocess-error.patch...
1:21: new blank line at EOF.
+
Applied patch gnu/packages/patches/multiqc-fix-git-subprocess-error.patch cleanly.
warning: 2 lines add whitespace errors.

index at:
100644 50807e2b781ed48b4480693c908775b4c0fc06a0	gnu/packages/patches/multiqc-fix-git-subprocess-error.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).