From 6e1257ed2d5c6d5da66452707960ce7181a651bb Mon Sep 17 00:00:00 2001
From: alalazo <massimiliano.culpo@googlemail.com>
Date: Wed, 18 May 2016 11:48:03 +0200
Subject: [PATCH 1/3] fixes #967

---
 lib/spack/spack/cmd/find.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/spack/spack/cmd/find.py b/lib/spack/spack/cmd/find.py
index 6896e92ef5e..9bcbf8d3766 100644
--- a/lib/spack/spack/cmd/find.py
+++ b/lib/spack/spack/cmd/find.py
@@ -170,7 +170,7 @@ def find(parser, args):
     if args.unknown:
         known = False
 
-    explicit = None
+    explicit = any
     if args.explicit:
         explicit = False
     if args.implicit:

From 164da8eed115394dab3713930348b1112e544fb2 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Wed, 18 May 2016 08:30:13 -0700
Subject: [PATCH 2/3] Version bump to 0.9.1

- Bugfixes for spack find
- 0.9.1 can read specs from current develop.
---
 lib/spack/spack/__init__.py | 2 +-
 lib/spack/spack/spec.py     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
index c7a155597fe..8c6e0ba5277 100644
--- a/lib/spack/spack/__init__.py
+++ b/lib/spack/spack/__init__.py
@@ -105,7 +105,7 @@
 
 # Version information
 from spack.version import Version
-spack_version = Version("0.9")
+spack_version = Version("0.9.1")
 
 #
 # Executables used by Spack
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index 470353c4f69..3f1fc115b84 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -717,8 +717,9 @@ def from_node_dict(node):
         else:
             spec.compiler = CompilerSpec.from_dict(node)
 
-        for name, enabled in node['variants'].items():
-            spec.variants[name] = VariantSpec(name, enabled)
+        if 'variants' in node:
+            for name, enabled in node['variants'].items():
+                spec.variants[name] = VariantSpec(name, enabled)
 
         return spec
 

From 4f8167b7ed8fe156e1f350aaa37230ab07a27895 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Mon, 15 Aug 2016 10:49:09 -0700
Subject: [PATCH 3/3] Don't assume spack is in the path when building docs.

---
 lib/spack/docs/conf.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/spack/docs/conf.py b/lib/spack/docs/conf.py
index 3d2a8251aa7..f3cb268177a 100644
--- a/lib/spack/docs/conf.py
+++ b/lib/spack/docs/conf.py
@@ -51,7 +51,8 @@
 os.environ['PATH'] += os.pathsep + '$SPACK_ROOT/bin'
 
 spack_version =  subprocess.Popen(
-    ['spack', '-V'], stderr=subprocess.PIPE).communicate()[1].strip().split('.')
+    [spack_root + '/bin/spack', '-V'],
+    stderr=subprocess.PIPE).communicate()[1].strip().split('.')
 
 # Set an environment variable so that colify will print output like it would to
 # a terminal.