From 153133c08fb00deba3ef0800060153a54fb949ab Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Mon, 20 Nov 2017 21:20:38 +0100 Subject: Revert "recursiveloader: Fix adding top-level Manifest ignores to all Manifests" The redesign made it harder to avoid duplicate entries. --- gemato/recursiveloader.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gemato/recursiveloader.py b/gemato/recursiveloader.py index 728f8fc..270b6ce 100644 --- a/gemato/recursiveloader.py +++ b/gemato/recursiveloader.py @@ -150,8 +150,7 @@ class ManifestRecursiveLoader(object): # add initial IGNORE entries for ip in (self.profile - .get_ignore_paths_for_new_manifest( - os.path.dirname(relpath))): + .get_ignore_paths_for_new_manifest('')): ie = gemato.manifest.ManifestEntryIGNORE(ip) m.entries.append(ie) else: @@ -979,6 +978,11 @@ class ManifestRecursiveLoader(object): mpath, 0, {}) new_entries.append(fe) + for ip in (self.profile + .get_ignore_paths_for_new_manifest(relpath)): + ie = gemato.manifest.ManifestEntryIGNORE(ip) + m.entries.append(ie) + if new_entries: mpath, mdirpath, m = manifest_stack[-1] for fe in new_entries: -- cgit v1.2.3