diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-18 14:31:54 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-18 14:31:54 -0300 |
| commit | d17f9289fe900cd0e3d4add6f765cb036b5a17da (patch) | |
| tree | fa042504312966c0622d3befbc32559281388d6c /tools/scripts | |
| parent | 7ca93399381e75281b99129fa03c1343d06c9aea (diff) | |
| download | pfsense-d17f9289fe900cd0e3d4add6f765cb036b5a17da.zip pfsense-d17f9289fe900cd0e3d4add6f765cb036b5a17da.tar.gz | |
Fix 7ca93399 where I pushed wrong patch
Diffstat (limited to 'tools/scripts')
| -rwxr-xr-x | tools/scripts/update_package_pfPorts.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/scripts/update_package_pfPorts.php b/tools/scripts/update_package_pfPorts.php index 5bc911d..6b5cd5d 100755 --- a/tools/scripts/update_package_pfPorts.php +++ b/tools/scripts/update_package_pfPorts.php @@ -386,12 +386,16 @@ function create_port($pkg) { $makefile[] = $port_use; } } + $conflicts = ''; if (isset($pkg['noembedded'])) { - $pkg['conflicts'] = $product_name . '-base-nanobsd-[0-9]*' . (isset($pkg['conflicts']) ? ' ' . $pkg['conflicts'] : ''); + $conflicts = $product_name . '-base-nanobsd-[0-9]*'; } if (isset($pkg['conflicts']) && !empty($pkg['conflicts'])) { + $conflicts = trim($conflicts . ' ' . $port_name_prefix . $pkg['conflicts'] . '-[0-9]*'); + } + if (!empty($conflicts)) { $makefile[] = ""; - $makefile[] = "CONFLICTS=\t" . $port_name_prefix . $pkg['conflicts'] . '-[0-9]*'; + $makefile[] = "CONFLICTS=\t" . $conflicts; } $makefile[] = ""; $makefile[] = "NO_BUILD=\tyes"; |
