[SCM] vlc/experimental: Handle multiple flags
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Dec 10 20:53:05 UTC 2017
The following commit has been merged in the experimental branch:
commit 22004aa72d1ca8d58f7b7a7dc0397fa16eea7a3f
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Dec 10 21:52:43 2017 +0100
Handle multiple flags
diff --git a/debian/filter-plugin.py b/debian/filter-plugin.py
index f26c37e..120ebac 100644
--- a/debian/filter-plugin.py
+++ b/debian/filter-plugin.py
@@ -10,11 +10,11 @@ import sys
remove_plugins = os.getenv("removeplugins")
if remove_plugins is not None:
- remove_plugins = remove_plugins.split(" ")
+ remove_plugins = set(remove_plugins.split(" "))
else:
- remove_plugins = []
+ remove_plugins = set()
-plugin_re = re.compile(r"^(\S*) \[([a-zA-Z1-9._-]*)\]$")
+plugin_re = re.compile(r"^(\S*) \[([a-zA-Z1-9._-,]*)\]$")
for line in sys.stdin.readlines():
@@ -25,6 +25,7 @@ for line in sys.stdin.readlines():
continue
path = match.group(1)
- plugin = match.group(2)
- if plugin not in remove_plugins:
+ plugins = match.group(2)
+ plugins = set(plugins.split(','))
+ if not plugin & remove_plugins:
print(path)
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list