Merge pull request #310 from autopulated/master

never try to install over the top of linked modules

Author: autopulated

yotta/lib/component.py

@@ -482,6 +482,24 @@ def provider(
             if r:
                 r.setTestDependency(dspec.is_test_dependency)
                 return r
+            # before resorting to install this module, check if we have an
+            # existing linked module (which wasn't picked up because it didn't
+            # match the version specification) - if we do, then we shouldn't
+            # try to install, but should return that anyway:
+            default_path = os.path.join(self.modulesPath(), dspec.name)
+            if fsutils.isLink(default_path):
+                r = Component(
+                                       default_path,
+                     test_dependency = dspec.is_test_dependency,
+                    installed_linked = fsutils.isLink(default_path)
+                )
+                if r:
+                    assert(r.installedLinked())
+                    return r
+                else:
+                    logger.error('linked module %s is invalid: %s', dspec.name, r.getError())
+                    return r
+
             r = access.satisfyVersionByInstalling(dspec.name, dspec.version_req, self.modulesPath())
             if not r:
                 logger.error('could not install %s' % name)

yotta/lib/pack.py

@@ -139,8 +139,9 @@ def __init__(
                         raise Exception('missing "version"')
             except Exception as e:
                 self.description = OrderedDict()
+                self.error = "Description invalid %s: %s" % (description_file, e);
                 logger.debug(self.error)
-                raise InvalidDescription("Description invalid %s: %s" % (description_file, e))
+                raise InvalidDescription(self.error)
         else:
             self.error = "No %s file." % description_filename
             self.description = OrderedDict()

yotta/list.py

@@ -120,7 +120,8 @@ def format(
         indent=u'',
         tee=u'',
         installed_at=u'',
-        test_dep=False
+        test_dep=False,
+        spec=None
     ):
         r = u''
 
@@ -169,7 +170,9 @@ def shouldDisplay(x):
 
 
         line = indent[:-2] + tee + component.getName() + u' ' + DIM + str(component.getVersion()) + RESET
-
+        
+        if spec and not spec.match(component.getVersion()):
+            line += u' ' + RESET + BRIGHT + RED + str(spec) + RESET
         if test_dep:
             line += u' ' + DIM + u'(test dependency)' + RESET
         if len(installed_at):
@@ -220,7 +223,8 @@ def shouldDisplay(x):
                                  processed,
                                next_indent,
                                   next_tee,
-                                  test_dep = isTestOnly(name)
+                                  test_dep = isTestOnly(name),
+                                      spec = spec
                         )
                     else:
                         r += self.format(
@@ -229,7 +233,8 @@ def shouldDisplay(x):
                                next_indent,
                                   next_tee,
                               installed_at = relpathIfSubdir(dep.path),
-                                  test_dep = isTestOnly(name)
+                                  test_dep = isTestOnly(name),
+                                      spec = spec
                         )
                 else:
                     r += indent + tee + DIM + name + spec_descr + RESET + '\n'