summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-08-19 19:01:57 +0000
committerErmal <eri@pfsense.org>2011-08-19 19:01:57 +0000
commit23fc1ae82dd47b08e31665edf159d128b8d3a36f (patch)
treed7d1269432e246fef11c305653989083f8849c12
parent582934a927dace637fab43ae403882573f0416b2 (diff)
downloadpfsense-23fc1ae82dd47b08e31665edf159d128b8d3a36f.zip
pfsense-23fc1ae82dd47b08e31665edf159d128b8d3a36f.tar.gz
Show the package name that are geing downloaded even during console update
-rw-r--r--etc/inc/pfsense-utils.inc5
-rw-r--r--etc/inc/pkg-utils.inc1
2 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index c75ae20..3d51fa9 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1546,7 +1546,8 @@ function update_output_window($text) {
echo "\n<script language=\"JavaScript\">\nthis.document.forms[0].output.value = \"" . $log . "\";\n";
echo "this.document.forms[0].output.scrollTop = this.document.forms[0].output.scrollHeight;\n";
echo "</script>";
- }
+ } else
+ echo $text;
/* ensure that contents are written out */
ob_flush();
}
@@ -2245,4 +2246,4 @@ function pfSense_handle_custom_code($src_dir) {
}
}
-?> \ No newline at end of file
+?>
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index eb19ea3..9eef578 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -481,6 +481,7 @@ function pkg_fetch_recursive($pkgname, $filename, $dependlevel = 0, $base_url =
$base_url = substr($base_url, 0, -1);
$fetchto = "{$fetchdir}/apkg_{$filename}";
$static_output .= "\n" . str_repeat(" ", $dependlevel * 2 + 1) . "Downloading {$base_url}/{$filename} ... ";
+ update_output_window($static_output);
if (download_file_with_progress_bar("{$base_url}/{$filename}", $fetchto) !== true) {
if ($base_url != $priv_url && download_file_with_progress_bar("{$priv_url}/{$filename}", $fetchto) !== true) {
$static_output .= " could not download from there or {$priv_url}/{$filename}.\n";
OpenPOWER on IntegriCloud