From 26ec46e834ceb8125b3f176c4d49ee148736f7c8 Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Wed, 3 Aug 2022 11:22:05 -0500 Subject: r-rhtslib: fix issue with git commit for v1.28 (#31653) There is a problem with the git repo for rhtslib that apparently led to a bad version entry during the previous round of package updates. A git checkout on the commit also fails so use branch for most recent version. --- var/spack/repos/builtin/packages/r-rhtslib/package.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rhtslib/package.py b/var/spack/repos/builtin/packages/r-rhtslib/package.py index c5d882abfc..f2bc370896 100644 --- a/var/spack/repos/builtin/packages/r-rhtslib/package.py +++ b/var/spack/repos/builtin/packages/r-rhtslib/package.py @@ -17,7 +17,17 @@ class RRhtslib(RPackage): bioc = "Rhtslib" - version("1.99.5", commit="a5335e1fea92ea06c33d42c7e290b6d8b4245ad3") + # There is a problem with the git repository where the commit for + # version 1.28.0 pulls changes to a file that blocks checking out the + # commit. Use the branch instead. + # error: Your local changes to the following files would be overwritten by + # checkout: + # src/htslib-1.15.1/htscodecs/tests/names/tok3/nv.names.1 + # Please, commit your changes or stash them before you can switch + # branches. + # Aborting + # version("1.28.0", commit='214fde2218bdbca89f1e12a30d2e081e76915aef') + version("1.28.0", branch="RELEASE_3_15") version("1.26.0", commit="f5b20e97b283942877529f750b28398782552655") version("1.22.0", commit="899b79faa54d42c7c9b9a2bc49972109637d367f") version("1.18.1", commit="751a2ebaed43b7991204b27bd6c7870645001d82") -- cgit v1.2.3-70-g09d2