From 07f91d28e718f6f636fa2feb0441774b220a87dd Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 19 Nov 2017 11:13:56 +0100 Subject: recursiveloader: Fix adding top-level Manifest ignores to all Manifests --- gemato/recursiveloader.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gemato/recursiveloader.py b/gemato/recursiveloader.py index 270b6ce..728f8fc 100644 --- a/gemato/recursiveloader.py +++ b/gemato/recursiveloader.py @@ -150,7 +150,8 @@ class ManifestRecursiveLoader(object): # add initial IGNORE entries for ip in (self.profile - .get_ignore_paths_for_new_manifest('')): + .get_ignore_paths_for_new_manifest( + os.path.dirname(relpath))): ie = gemato.manifest.ManifestEntryIGNORE(ip) m.entries.append(ie) else: @@ -978,11 +979,6 @@ 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