From 766590c481add6b2aac82fc45071e2f2022bb8fc Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 9 Feb 2016 22:48:52 +0100 Subject: [PATCH] patchupdate.py: Autodepends should ignore disabled patchsets. (cherry picked from commit 72f80a6c3c98b6f5225c8b915224a73eb2dee4e9) --- staging/patchupdate.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/staging/patchupdate.py b/staging/patchupdate.py index d2cf0600..2d4f8e5e 100755 --- a/staging/patchupdate.py +++ b/staging/patchupdate.py @@ -271,6 +271,10 @@ def load_patchsets(): categories[category] = set() categories[category].add(i) + # Filter autodepends on disabled patchsets + for i, patch in all_patches.iteritems(): + patch.auto_depends = set([j for j in patch.auto_depends if not all_patches[j].disabled]) + # Add virtual targets for all the categories for category, indices in categories.iteritems(): patch = PatchSet(category, directory)