Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -r1.49.2.7 -r1.49.2.8
--- openacs-4/packages/acs-admin/acs-admin.info 15 May 2016 12:12:02 -0000 1.49.2.7
+++ openacs-4/packages/acs-admin/acs-admin.info 15 May 2016 18:27:06 -0000 1.49.2.8
@@ -9,7 +9,7 @@
f
t
-
+
Don Baccus
An interface for Site-wide administration of an OpenACS Installation.
2015-10-04
@@ -20,7 +20,7 @@
GPL
3
-
+
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 -r1.14 -r1.14.2.1
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl 15 Jun 2015 11:10:10 -0000 1.14
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl 15 May 2016 18:27:06 -0000 1.14.2.1
@@ -29,6 +29,7 @@
#
#####
apm_get_package_repository -array repository
+ apm_get_installed_versions -array installed
set install_pkgs $package_key
while 1 {
@@ -86,13 +87,14 @@
set must_add {}
foreach p $properties(install) {
- if {$p ni $install_pkgs} {
+ if {$p ni $install_pkgs && ![info exists installed($p)]} {
+ #ns_log notice "+++ install_pkgs <$p> ni <$install_pkgs> and not already installed"
lappend must_add $p
}
}
if {[llength $must_add] > 0} {
- lappend install_pkgs {*}$must_add
ns_log notice "+++ install_pkgs <$install_pkgs> after must_add <$must_add>"
+ lappend install_pkgs {*}$must_add
set fixpoint_p 0
break
}