From e9ee9eaf500c052910b77d2c428ec88574f283be Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Wed, 4 Dec 2019 23:27:08 -0700 Subject: patching: do strict version range checking (#13989) * apply strict constraint checks for patches, otherwise Spack may incorrectly treat a version range constraint as satisfied when mixing x.y and x.y.z versions * add mixed version checks to version comparison tests --- var/spack/repos/builtin.mock/packages/patch/biz.patch | 1 + var/spack/repos/builtin.mock/packages/patch/package.py | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 var/spack/repos/builtin.mock/packages/patch/biz.patch (limited to 'var') diff --git a/var/spack/repos/builtin.mock/packages/patch/biz.patch b/var/spack/repos/builtin.mock/packages/patch/biz.patch new file mode 100644 index 0000000000..71a8a61460 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/patch/biz.patch @@ -0,0 +1 @@ +this patch is never applied, it is used to check spec semantics on when the concretizer chooses to include a patch diff --git a/var/spack/repos/builtin.mock/packages/patch/package.py b/var/spack/repos/builtin.mock/packages/patch/package.py index 37ea72fb1a..e6c8b33dcf 100644 --- a/var/spack/repos/builtin.mock/packages/patch/package.py +++ b/var/spack/repos/builtin.mock/packages/patch/package.py @@ -13,11 +13,14 @@ class Patch(Package): url = "http://www.example.com/patch-1.0.tar.gz" version('1.0', '0123456789abcdef0123456789abcdef') + version('1.0.1') + version('1.0.2') version('2.0', '0123456789abcdef0123456789abcdef') patch('foo.patch') patch('bar.patch', when='@2:') patch('baz.patch') + patch('biz.patch', when='@1.0.1:1.0.2') def install(self, spec, prefix): pass -- cgit v1.2.3-70-g09d2