From 9f36ae4e2072f94d7a3bdec5baa6ebebac15375f Mon Sep 17 00:00:00 2001 From: Matthew LeGendre Date: Fri, 21 Oct 2016 11:57:57 -0700 Subject: [PATCH 1/3] Extend concretization test to excercise bug in concretize's provider sorting --- .../packages/externalvirtual/package.py | 4 +- .../packages/othervirtual/package.py | 37 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin.mock/packages/othervirtual/package.py diff --git a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py index 1f3553014b..6310a17bc9 100644 --- a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py @@ -31,8 +31,10 @@ class Externalvirtual(Package): version('1.0', '1234567890abcdef1234567890abcdef') version('2.0', '234567890abcdef1234567890abcdef1') + version('2.1', '34567890abcdef1234567890abcdef12') + version('2.2', '4567890abcdef1234567890abcdef123') - provides('stuff') + provides('stuff', when='@1.0:') def install(self, spec, prefix): pass diff --git a/var/spack/repos/builtin.mock/packages/othervirtual/package.py b/var/spack/repos/builtin.mock/packages/othervirtual/package.py new file mode 100644 index 0000000000..83bc07df98 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/othervirtual/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Othervirtual(Package): + homepage = "http://somewhere.com" + url = "http://somewhere.com/stuff-1.0.tar.gz" + + version('1.0', '67890abcdef1234567890abcdef12345') + + provides('stuff') + + def install(self, spec, prefix): + pass From 73b46a92bcf0a415d5b4a3b29ca47df0d0544076 Mon Sep 17 00:00:00 2001 From: Matthew LeGendre Date: Fri, 21 Oct 2016 11:59:41 -0700 Subject: [PATCH 2/3] Fix concretize bug where provider sort couldn't handle version ranges --- lib/spack/spack/concretize.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index 9c9e9e10ff..3da5efc9fa 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -95,7 +95,11 @@ def cmp_externals(a, b): not b.external and b.external_module): # We're choosing between different providers, so # maintain order from provider sort - return candidates.index(a) - candidates.index(b) + index_of_a = next(i for i in range(0, len(candidates)) \ + if a.satisfies(candidates[i])) + index_of_b = next(i for i in range(0, len(candidates)) \ + if b.satisfies(candidates[i])) + return index_of_a - index_of_b result = cmp_specs(a, b) if result != 0: From 5ff08386af70818e48d81c1d49c0c6e373763c16 Mon Sep 17 00:00:00 2001 From: Matthew LeGendre Date: Fri, 21 Oct 2016 13:17:23 -0700 Subject: [PATCH 3/3] Remove unnecessary blackslash for flake8 --- lib/spack/spack/concretize.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index 3da5efc9fa..2351e2bfc9 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -95,9 +95,9 @@ def cmp_externals(a, b): not b.external and b.external_module): # We're choosing between different providers, so # maintain order from provider sort - index_of_a = next(i for i in range(0, len(candidates)) \ + index_of_a = next(i for i in range(0, len(candidates)) if a.satisfies(candidates[i])) - index_of_b = next(i for i in range(0, len(candidates)) \ + index_of_b = next(i for i in range(0, len(candidates)) if b.satisfies(candidates[i])) return index_of_a - index_of_b