Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/acs-admin/www/apm/packages-install.tcl 12 May 2002 20:57:01 -0000 1.10 +++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl 1 Jul 2002 11:14:31 -0000 1.11 @@ -30,7 +30,9 @@ # Determine which spec files are new installs; install all of the new items. set spec_files [list] -set warnings [list] +set already_installed_list [list] +set not_compatible_list [list] + foreach spec_file $all_spec_files { array set version [apm_read_package_info_file $spec_file] set version_name $version(name) @@ -41,13 +43,13 @@ if { [apm_higher_version_installed_p $package_key $version_name] } { lappend spec_files $spec_file } else { - lappend warnings "Package "$package_name" ($package_key) skipped because a later version is already installed." + lappend already_installed_list "Package "$package_name" ($package_key) version $version_name or higher is already installed." } } else { lappend spec_files $spec_file } } else { - lappend warnings "Package "$package_name" ($package_key) skipped because it doesn't support [db_type]." + lappend not_compatible_list "Package "$package_name" ($package_key) doesn't support [db_type]." } } @@ -56,11 +58,6 @@ ns_write "Done.

" -if { [llength $warnings] > 0 } { - ns_write "

Packages skipped

" -} - - if { [empty_string_p $spec_files] } { # No spec files to work with. ns_write " @@ -69,7 +66,6 @@ There are no new packages to install. Please load some using the Package Loader.

Return to the APM.

- [ad_footer] " } else { @@ -84,8 +80,14 @@ If you think you might want to use a package later (but not right away), - install it but don't enable it.

+ install it but don't enable it.

" + if { [llength $not_compatible_list] > 0 } { + ns_write "

If there's a package that you can't find in the list below, it may be because it's incompatible with your system.

" + } + + ns_write " +