fix all the things

easybuild/framework/easyconfig/easyconfig.py

@@ -883,22 +883,35 @@ def find_related_easyconfigs(path, ec):
     toolchain = "%s-%s" % (toolchain_name, ec['toolchain']['version'])
     full_version = det_full_ec_version(ec)
 
-    patterns = [
+    potential_paths = [os.path.dirname(path) for path in create_paths(path, name, version)]
+    result_potential_paths = []
+
+    for pot in potential_paths:
+        try:
+            result_potential_paths.append([os.path.join(pot,base) for base in os.listdir(pot) if os.path.isfile(os.path.join(pot,base))])
+        except:
+            None
+
+    # flatten
+    result_potential_paths = sum(result_potential_paths, [])
+
+    regexes = [
         # exact match
-        ("%s-%s" % (name, full_version)),
+        re.compile(("^\S*/%s-%s.eb$" % (name, full_version))),
         # same version, same toolchain name
-        ("%s-%s-%s-*" % (name, version, toolchain_name)),
+        re.compile(("^\S*/%s-%s-%s-\S*.eb$" % (name, version, toolchain_name))),
         # Same version, any toolchain
-        ("%s-%s-*" % (name, version)),
+        re.compile(("^\S*/%s-%s-\S*.eb$" % (name, version))),
         # any version, same toolchain
-        ("%s-*-%s-*" % (name, toolchain)),
+        re.compile(("^\S*/%s-\S*-%s-\S*.eb$" % (name, toolchain))),
         # any version, same toolchain name
-        ("%s-*-%s-*" % (name, toolchain_name)),
-        # any version, any toolchain
-        ("*"),
+        re.compile(("^\S*/%s-\S*-%s-\S*.eb$" % (name, toolchain_name))),
     ]
+    _log.debug("found these potential paths: %s" % result_potential_paths)
 
-    return [glob.glob("%s.eb" % os.path.join(path, name.lower()[0], name, *cand_path)) for cand_path in patterns]
+    result = [filter(lambda path: regex.match(path),result_potential_paths) for regex in regexes]
+    result.append(result_potential_paths)
+    return result
 
 
 def process_easyconfig(path, build_specs=None, validate=True, parse_only=False):

easybuild/framework/easyconfig/review.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # #
 # Copyright 2014 Ghent University
 #

easybuild/tools/multi_diff.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # #
 # Copyright 2014 Ghent University
 #
@@ -167,8 +166,6 @@ def _colorize(self, line, squigly):
             chars.insert(0, color_map.get(line[0],''))
             chars.append(ENDC)
 
-
-
         return ''.join(chars)
 
     def _color(self, line, color):

easybuild/tools/terminal.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # #
 # Copyright 2009-2014 Ghent University
 #