Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v diff -u -N -r1.29 -r1.30 --- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 23 Jul 2018 15:00:28 -0000 1.29 +++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 23 Jul 2018 15:15:24 -0000 1.30 @@ -118,11 +118,12 @@ set package_key [pkg_info_key $pkg_info] set package_path [pkg_info_path $pkg_info] set spec_file [pkg_info_spec $pkg_info] - array set package [apm_read_package_info_file $spec_file] - set version_name $package(name) + set package [apm_read_package_info_file $spec_file] + set package_name [dict get $package package-name] + set version_name [dict get $package name] ns_log Debug "Selection widget: $package_key, Dependency: [pkg_info_dependency_p $pkg_info]" - append widget " " + append widget [subst {}] if { [pkg_info_dependency_p $pkg_info] == "t" } { # Dependency passed. @@ -135,25 +136,25 @@ } append widget [subst {> - $package(package-name) $package(name) + $package_name $version_name $package_key Dependencies satisfied. }] } elseif { [pkg_info_dependency_p $pkg_info] == "f" } { #Dependency failed. append widget [subst { - $package(package-name) $package(name) + $package_name $version_name $package_key }] foreach comment [pkg_info_comment $pkg_info] { append widget "$comment
" } - append widget " -
- - " + append widget { + + + } } else { # No dependency information. # See if the install is already installed with a higher version number. @@ -174,16 +175,16 @@ set comment "Installing older version of package." } - set install_checked [lindex {"" checked} [expr {$package_key in $to_install}]] - append widget " + set install_checked [expr {$package_key in $to_install ? "checked" : ""}] + append widget [subst { - $package(package-name) $package(name) + $package_name $version_name $package_key $comment - " + }] } } - append widget "\n" + append widget {} return $widget }