diff options
| author | Ali Bahrami <Ali.Bahrami@Oracle.COM> | 2010-06-28 09:11:16 -0600 |
|---|---|---|
| committer | Ali Bahrami <Ali.Bahrami@Oracle.COM> | 2010-06-28 09:11:16 -0600 |
| commit | d24e1a1da37e9f5e4c5b11a5da612fdd70d873f0 (patch) | |
| tree | 9bc922e827c991be933bea050fcd99934de9fa7c /usr/src/tools/onbld | |
| parent | 0673ac10697e2637ba66951f5005ae24e0c40f5c (diff) | |
| download | illumos-gate-d24e1a1da37e9f5e4c5b11a5da612fdd70d873f0.tar.gz | |
6916796 OSnet mapfiles should use version 2 link-editor syntax (fix mapfilechk,unref)
Diffstat (limited to 'usr/src/tools/onbld')
| -rw-r--r-- | usr/src/tools/onbld/hgext/cdm.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/tools/onbld/hgext/cdm.py b/usr/src/tools/onbld/hgext/cdm.py index 577da5544d..2241519f26 100644 --- a/usr/src/tools/onbld/hgext/cdm.py +++ b/usr/src/tools/onbld/hgext/cdm.py @@ -351,15 +351,18 @@ def cdm_mapfilechk(ui, repo, *args, **opts): # - Ends with '.map' # We don't want to match unless these things occur in final path segment # because directory names with these strings don't indicate a mapfile. - MapfileRE = re.compile(r'.*((mapfile[^/]*)|(/map\.*[^/]*)|(\.map))$', + # We also ignore files with suffixes that tell us that the files + # are not mapfiles. + MapfileRE = re.compile(r'.*((mapfile[^/]*)|(/map\.+[^/]*)|(\.map))$', re.IGNORECASE) + NotMapSuffixRE = re.compile(r'.*\.[ch]$', re.IGNORECASE) ui.write('Mapfile comment check:\n') for f, e in filelist: if e and e.is_removed(): continue - elif not MapfileRE.match(f): + elif (not MapfileRE.match(f)) or NotMapSuffixRE.match(f): continue elif (e or opts.get('honour_nots')) and exclude(f): ui.status('Skipping %s...\n' % f) |