changeset 16005:dea42a47850e

made canonicalizeprojects handle projects depending on a missing jrelibrary
author Doug Simon <doug.simon@oracle.com>
date Tue, 03 Jun 2014 16:29:17 +0200
parents f5ae86b125fd
children a831a16e52b4
files mxtool/mx.py
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Tue Jun 03 14:32:43 2014 +0200
+++ b/mxtool/mx.py	Tue Jun 03 16:29:17 2014 +0200
@@ -2651,11 +2651,10 @@
             for line in f:
                 line = line.strip()
                 m = pattern.match(line)
-                if m is None:
+                p = project(m.group(1), fatalIfMissing=False) if m else None
+                if m is None or p is None:
                     out.write(line + '\n')
                 else:
-                    p = project(m.group(1))
-
                     for pkg in p.defined_java_packages():
                         if not pkg.startswith(p.name):
                             abort('package in {0} does not have prefix matching project name: {1}'.format(p, pkg))