From 240a9e6284cf917c421c9790e2439669e17ce974 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Tue, 14 Jan 2020 11:59:10 -0600
Subject: [PATCH] Fix parsing of rocketmq URL (#14490)
---
lib/spack/spack/test/url_parse.py | 2 ++
lib/spack/spack/url.py | 1 +
2 files changed, 3 insertions(+)
diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py
index 5af2f234f3..0651562007 100644
--- a/lib/spack/spack/test/url_parse.py
+++ b/lib/spack/spack/test/url_parse.py
@@ -74,6 +74,8 @@
('numpy-1.12.0-cp27-cp27m-macosx_10_6_intel.macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl', 'numpy-1.12.0'), # noqa
# PyPI - exe
('PyYAML-3.12.win-amd64-py3.5.exe', 'PyYAML-3.12'),
+ # Combinations of multiple patterns - bin, release
+ ('rocketmq-all-4.5.2-bin-release', 'rocketmq-all-4.5.2'),
# Combinations of multiple patterns - all
('p7zip_9.04_src_all', 'p7zip_9.04'),
# Combinations of multiple patterns - run
diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py
index 3357d39a29..a728c46a71 100644
--- a/lib/spack/spack/url.py
+++ b/lib/spack/spack/url.py
@@ -175,6 +175,7 @@ def strip_version_suffixes(path):
# Download version
r'release',
+ r'bin',
r'stable',
r'[Ff]inal',
r'rel',
--
GitLab