Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v diff -u -N -r1.17.2.2 -r1.17.2.3 --- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl 24 Sep 2019 08:54:38 -0000 1.17.2.2 +++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl 24 Sep 2019 08:55:14 -0000 1.17.2.3 @@ -42,7 +42,7 @@ #ns_log notice "RESULT of apm_dependency_check_new: [array get result]" array set failed $result(failed) - + switch -- $result(status) { ok { set title "Confirm" @@ -60,9 +60,9 @@ # set pkg_info_list {} foreach pkg $result(packages) { - + # - # Load package info from spec file. + # Load package info from spec file. # unset -nocomplain spec_file if {[catch {set spec_file [apm_package_info_file_path $pkg]}]} { @@ -74,7 +74,7 @@ # array set package [list package.key $pkg embeds "" extends "" \ provides "" requires "" properties {install ""}] - } + } } if {[info exists spec_file]} { @@ -93,7 +93,7 @@ } else { lassign {t ""} flag comments array set properties $package(properties) - + set must_add {} foreach p $properties(install) { if {$p ni $install_pkgs && ![info exists installed($p)]} { @@ -128,7 +128,7 @@ set body [subst {

Additional Packages Automatically Added

- + Some of the packages you were trying to install required other packages to be installed first. We've added these additional packages needed, and ask you to review the list @@ -142,9 +142,9 @@

}] - + } elseif {$result(status) eq "ok" || $force_p} { - + # We use client properties to pass along this information as # it is fairly large. ad_set_client_property -clob t apm pkg_install_list $pkg_info_list @@ -162,7 +162,7 @@ set body [subst {

Unsatisfied Dependencies

- + Some of the packages you are trying to install have unsatisfied dependencies. The packages with unsatisfied dependencies have been deselected. If you wish to install @@ -174,7 +174,7 @@ If you think you might want to use a package later (but not right away), install it but don't enable it. }] - + append body \ [apm_package_selection_widget $pkg_info_list $result(install)] \ [subst { @@ -183,8 +183,6 @@ }] } - - } ad_return_template apm