summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-11-06 13:17:52 -0200
committerRenato Botelho <renato@netgate.com>2015-11-06 13:17:52 -0200
commit77d69dadc61cd4607b361080dff3dad6da5450a3 (patch)
tree621dee0e07f0d46d4e34087386a5205a84ffa9b1 /tools
parent9da2cf1c6e8e2e9b99d2369dbedb13c580a39377 (diff)
downloadpfsense-77d69dadc61cd4607b361080dff3dad6da5450a3.zip
pfsense-77d69dadc61cd4607b361080dff3dad6da5450a3.tar.gz
Deal with multiple conflicts
Diffstat (limited to 'tools')
-rwxr-xr-xtools/scripts/update_package_pfPorts.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/scripts/update_package_pfPorts.php b/tools/scripts/update_package_pfPorts.php
index a6a61b3..7536b36 100755
--- a/tools/scripts/update_package_pfPorts.php
+++ b/tools/scripts/update_package_pfPorts.php
@@ -391,7 +391,9 @@ function create_port($pkg) {
$conflicts = $product_name . '-base-nanobsd-[0-9]*';
}
if (isset($pkg['conflicts']) && !empty($pkg['conflicts'])) {
- $conflicts = trim($conflicts . ' ' . $port_name_prefix . $pkg['conflicts'] . '-[0-9]*');
+ foreach (preg_split('/[\s\t]+/', $pkg['conflicts']) as $conflict) {
+ $conflicts = trim($conflicts . ' ' . $port_name_prefix . $conflict . '-[0-9]*');
+ }
}
if (!empty($conflicts)) {
$makefile[] = "";
OpenPOWER on IntegriCloud