diff options
| author | Michał Górny <mgorny@gentoo.org> | 2017-11-20 21:20:38 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-11-20 21:56:37 +0100 |
| commit | 153133c08fb00deba3ef0800060153a54fb949ab (patch) | |
| tree | f9be39f40f7faee23067395fca7e0deb7c2d38e9 | |
| parent | 8eebdd8ee5a7d0e5eab398908c51c3c2a312bcbe (diff) | |
| download | gemato-153133c08fb00deba3ef0800060153a54fb949ab.tar.gz | |
Revert "recursiveloader: Fix adding top-level Manifest ignores to all Manifests"
The redesign made it harder to avoid duplicate entries.
| -rw-r--r-- | gemato/recursiveloader.py | 8 |
1 files 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: |