diff options
author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2016-02-27 07:45:41 +0000 |
---|---|---|
committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2016-02-27 09:37:13 +0000 |
commit | cafab9ec089e3d9c5a02d41d9809ee42d2ff9af3 (patch) | |
tree | e2f53b84139327da4b4ed1337e6369b13f6a15b3 /ybd/utils.py | |
parent | 6f0533fa428a27016773c11409c113c5defc4ae2 (diff) | |
download | ybd-cafab9ec089e3d9c5a02d41d9809ee42d2ff9af3.tar.gz |
Only report overlaps once
Diffstat (limited to 'ybd/utils.py')
-rw-r--r-- | ybd/utils.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ybd/utils.py b/ybd/utils.py index cdaf64e..eb3fce1 100644 --- a/ybd/utils.py +++ b/ybd/utils.py @@ -95,16 +95,7 @@ def _process_tree(srcpath, destpath, actionfunc): import re path = re.search('/.*$', re.search('tmp[^/]+/.*$', destpath).group(0)).group(0) - app.log('OVERLAP', 'WARNING: Overlapping file', path) - baserockdir = os.path.join(destpath.replace(path, ''), 'baserock') - - for filename in os.listdir(baserockdir): - with open(os.path.join(baserockdir, filename)) as f: - for line in f: - if path[1:] in line: - app.log(filename, 'Contains', path[1:]) - break - + app.config['new-overlaps'] += [path] os.remove(destpath) os.symlink(os.readlink(srcpath), destpath) |