mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp

Browse Source
This commit is contained in:
gnhb 2010-06-09 23:20:50 +07:00
commit 33d2e5106b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
etc/inc/pkg-utils.inc
View File

@ -882,24 +882,6 @@ function delete_package_xml($pkg) {
eval_once($pkg_config['custom_php_global_functions']);
if($pkg_config['custom_php_pre_deinstall_command'] <> "")
eval_once($pkg_config['custom_php_pre_deinstall_command']);
/* remove all additional files */
if(is_array($pkg_config['additional_files_needed'])) {
$static_output .= "\tAuxiliary files... ";
update_output_window($static_output);
foreach($pkg_config['additional_files_needed'] as $afn) {
$filename = get_filename_from_url($afn['item'][0]);
if($afn['prefix'] <> "") {
$prefix = $afn['prefix'];
} else {
$prefix = "/usr/local/pkg/";
}
unlink_if_exists($prefix . $filename);
if(file_exists($prefix . $filename))
mwexec("rm -rf {$prefix}{$filename}");
}
$static_output .= "done.\n";
update_output_window($static_output);
}
/* system files */
if(is_array($pkg_config['modify_system']['item'])) {
$static_output .= "\tSystem files... ";
@ -935,6 +917,24 @@ function delete_package_xml($pkg) {
update_output_window($static_output);
}
/* remove all additional files */
if(is_array($pkg_config['additional_files_needed'])) {
$static_output .= "\tAuxiliary files... ";
update_output_window($static_output);
foreach($pkg_config['additional_files_needed'] as $afn) {
$filename = get_filename_from_url($afn['item'][0]);
if($afn['prefix'] <> "") {
$prefix = $afn['prefix'];
} else {
$prefix = "/usr/local/pkg/";
}
unlink_if_exists($prefix . $filename);
if(file_exists($prefix . $filename))
mwexec("rm -rf {$prefix}{$filename}");
}
$static_output .= "done.\n";
update_output_window($static_output);
}
/* package XML file */
$static_output .= "\tPackage XML... ";
update_output_window($static_output);