summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@gmail.com>2011-11-03 12:43:48 -0400
committerScott Ullrich <sullrich@gmail.com>2011-11-03 12:43:48 -0400
commit19f576fdf65e8bdee3ce59b14bd8647e765ab24f (patch)
tree5265429d2c4b65a37b50f2d02862f9e07e618a20 /etc
parent2bd6b12b1d62b3ad0828e668d2d7d302a72e22eb (diff)
downloadpfsense-19f576fdf65e8bdee3ce59b14bd8647e765ab24f.zip
pfsense-19f576fdf65e8bdee3ce59b14bd8647e765ab24f.tar.gz
Allow carriage returns to separate filenames as well as spaces
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pkg-utils.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 854436b..357e9c9 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -474,6 +474,11 @@ function sync_package($pkg_name, $sync_depends = true, $show_message = false) {
function pkg_fetch_recursive($pkgname, $filename, $dependlevel = 0, $base_url = "") {
global $static_output, $g;
+ // Clean up incoming filenames
+ $filename = str_replace(" ", " ", $filename);
+ $filename = str_replace("\n", " ", $filename);
+ $filename = str_replace(" ", " ", $filename);
+
$pkgs = split(" ", $filename);
foreach($pkgs as $filename) {
if (($g['platform'] == "nanobsd") || ($g['platform'] == "embedded")) {
OpenPOWER on IntegriCloud