]> git.ipfire.org Git - pakfire.git/commitdiff
Fix filtering for regular expressions in dependencies.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Dec 2011 23:05:43 +0000 (00:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Dec 2011 23:05:43 +0000 (00:05 +0100)
python/pakfire/packages/make.py

index 9380e3ce5fc1cc8df567b618626101929adf481d..826eb45d43a7debfad8135ef497cfae42454641b 100644 (file)
@@ -426,12 +426,18 @@ class MakefilePackage(MakefileBase):
                for dep in deps:
                        filtered = False
                        for filter in filters:
+                               # Convert to raw string to make escaping characters
+                               # easy to the user.
+                               filter = "%r" % filter
+
+                               # Search for a match anywhere in the line.
                                m = re.search(filter, dep)
                                if not m:
                                        continue
 
                                # Yes, we found a match.
                                filtered = True
+                               break
 
                        if not filtered:
                                filtered_deps.append(dep)