From 9d1f71e89f184d9b05f15ff81532aec460795fd0 Mon Sep 17 00:00:00 2001
From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>
Date: Fri, 29 May 2020 20:07:44 +0200
Subject: repo: fix construction of UnknownPackageError (#16865)

Also improve the error messages
---
 lib/spack/spack/repo.py      | 34 +++++++++++++++++++---------------
 lib/spack/spack/test/repo.py |  5 +++++
 2 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py
index 764f1f9168..8d31f2cf49 100644
--- a/lib/spack/spack/repo.py
+++ b/lib/spack/spack/repo.py
@@ -759,8 +759,8 @@ class Repo(object):
 
         """
         parent = None
-        for l in range(1, len(self._names) + 1):
-            ns = '.'.join(self._names[:l])
+        for i in range(1, len(self._names) + 1):
+            ns = '.'.join(self._names[:i])
 
             if ns not in sys.modules:
                 module = SpackNamespace(ns)
@@ -773,7 +773,7 @@ class Repo(object):
                 # This ensures that we can do things like:
                 #    import spack.pkg.builtin.mpich as mpich
                 if parent:
-                    modname = self._names[l - 1]
+                    modname = self._names[i - 1]
                     setattr(parent, modname, module)
             else:
                 # no need to set up a module
@@ -882,9 +882,7 @@ class Repo(object):
             raise UnknownPackageError(spec.name)
 
         if spec.namespace and spec.namespace != self.namespace:
-            raise UnknownPackageError(
-                "Repository %s does not contain package %s"
-                % (self.namespace, spec.fullname))
+            raise UnknownPackageError(spec.name, self.namespace)
 
         package_class = self.get_pkg_class(spec.name)
         try:
@@ -1271,16 +1269,22 @@ class UnknownPackageError(UnknownEntityError):
 
     def __init__(self, name, repo=None):
         msg = None
-        if repo:
-            msg = "Package '%s' not found in repository '%s'" % (name, repo)
-        else:
-            msg = "Package '%s' not found." % name
-
-        # special handling for specs that may have been intended as filenames
-        # prompt the user to ask whether they intended to write './<name>'
         long_msg = None
-        if name.endswith(".yaml"):
-            long_msg = "Did you mean to specify a filename with './%s'?" % name
+        if name:
+            if repo:
+                msg = "Package '{0}' not found in repository '{1}'"
+                msg = msg.format(name, repo)
+            else:
+                msg = "Package '{0}' not found.".format(name)
+
+            # Special handling for specs that may have been intended as
+            # filenames: prompt the user to ask whether they intended to write
+            # './<name>'.
+            if name.endswith(".yaml"):
+                long_msg = "Did you mean to specify a filename with './{0}'?"
+                long_msg = long_msg.format(name)
+        else:
+            msg = "Attempting to retrieve anonymous package."
 
         super(UnknownPackageError, self).__init__(msg, long_msg)
         self.name = name
diff --git a/lib/spack/spack/test/repo.py b/lib/spack/spack/test/repo.py
index 2cd1c0fa4a..d10349e6ec 100644
--- a/lib/spack/spack/test/repo.py
+++ b/lib/spack/spack/test/repo.py
@@ -51,6 +51,11 @@ def test_repo_unknown_pkg(mutable_mock_repo):
         mutable_mock_repo.get('builtin.mock.nonexistentpackage')
 
 
+def test_repo_anonymous_pkg(mutable_mock_repo):
+    with pytest.raises(spack.repo.UnknownPackageError):
+        mutable_mock_repo.get('+variant')
+
+
 @pytest.mark.maybeslow
 def test_repo_last_mtime():
     latest_mtime = max(os.path.getmtime(p.module.__file__)
-- 
cgit v1.2.3-60-g2f50