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.18.8.5 -r1.18.8.6 --- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 9 Oct 2013 06:47:30 -0000 1.18.8.5 +++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 11 Oct 2013 11:43:46 -0000 1.18.8.6 @@ -131,7 +131,7 @@ append widget " " - if { [pkg_info_dependency_p $pkg_info] eq "t" } { + if { [pkg_info_dependency_p $pkg_info] == "t" } { # Dependency passed. if { $install_enable_p } { @@ -165,7 +165,7 @@ $package_rel_path Dependencies satisfied. " - } elseif { [pkg_info_dependency_p $pkg_info] eq "f" } { + } elseif { [pkg_info_dependency_p $pkg_info] == "f" } { #Dependency failed. if { $install_enable_p } { append widget " view files" - if { $installed_p eq "t" && $enabled_p eq "t" } { + if { $installed_p == "t" && $enabled_p == "t" } { if {!$performance_p} { lappend file_link_list "watch all files" } Index: openacs-4/packages/acs-admin/www/apm/package-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete.tcl,v diff -u -N -r1.9.8.6 -r1.9.8.7 --- openacs-4/packages/acs-admin/www/apm/package-delete.tcl 28 Sep 2013 12:09:59 -0000 1.9.8.6 +++ openacs-4/packages/acs-admin/www/apm/package-delete.tcl 11 Oct 2013 11:43:46 -0000 1.9.8.7 @@ -47,7 +47,7 @@ where package_key = :package_key }] -if {$initial_install_p eq "t"} { +if {$initial_install_p == "t"} { set kernel_deletion_warning "

You are about to delete package $package_key which is part of the OpenACS core 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.12.4.7 -r1.12.4.8 --- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl 2 Oct 2013 08:56:25 -0000 1.12.4.7 +++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl 11 Oct 2013 11:43:46 -0000 1.12.4.8 @@ -87,7 +87,7 @@ }] - } elseif { ([lindex $dependency_results 0] == 1) || $force_p eq "t" } { + } elseif { ([lindex $dependency_results 0] == 1) || $force_p == "t" } { ### Check passed! Initiate install. Index: openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl,v diff -u -N -r1.9.6.1 -r1.9.6.2 --- openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl 27 Aug 2013 11:44:43 -0000 1.9.6.1 +++ openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl 11 Oct 2013 11:43:46 -0000 1.9.6.2 @@ -51,7 +51,7 @@ } # LARS hack -set sections [lindex [lindex [apm_parameter_section_slider $package_key] 0] 3] +set sections [lindex [apm_parameter_section_slider $package_key] 0 3] foreach section $sections { if {$section_name eq [lindex $section 1]} { set section_name [lindex $section 0] Index: openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl,v diff -u -N -r1.6.10.1 -r1.6.10.2 --- openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl 28 Sep 2013 12:10:00 -0000 1.6.10.1 +++ openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl 11 Oct 2013 11:43:46 -0000 1.6.10.2 @@ -17,7 +17,7 @@ } # LARS hack -set sections [lindex [lindex [apm_parameter_section_slider $package_key] 0] 3] +set sections [lindex [apm_parameter_section_slider $package_key] 0 3] foreach section $sections { if {$section_name eq [lindex $section 1]} { set section_name [lindex $section 0] Index: openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl,v diff -u -N -r1.6.10.1 -r1.6.10.2 --- openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl 27 Aug 2013 11:44:43 -0000 1.6.10.1 +++ openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl 11 Oct 2013 11:43:46 -0000 1.6.10.2 @@ -39,7 +39,7 @@ } # LARS hack -set sections [lindex [lindex [apm_parameter_section_slider $package_key] 0] 3] +set sections [lindex [apm_parameter_section_slider $package_key] 0 3] foreach section $sections { if {$section_name eq [lindex $section 1]} { set section_name [lindex $section 0] Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl,v diff -u -N -r1.7.4.2 -r1.7.4.3 --- openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl 28 Sep 2013 12:10:00 -0000 1.7.4.2 +++ openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl 11 Oct 2013 11:43:47 -0000 1.7.4.3 @@ -65,7 +65,7 @@ } else { append body "

  • This package does not $dependency_type any services.\n" } - if { $installed_p eq "t" && $dependency_type ne "provide"} { + if { $installed_p == "t" && $dependency_type ne "provide"} { append body [subst {
  • Add a service $dependency_type_prep_2 by this package Index: openacs-4/packages/acs-admin/www/apm/version-files.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-files.tcl,v diff -u -N -r1.16.8.2 -r1.16.8.3 --- openacs-4/packages/acs-admin/www/apm/version-files.tcl 28 Sep 2013 12:10:01 -0000 1.16.8.2 +++ openacs-4/packages/acs-admin/www/apm/version-files.tcl 11 Oct 2013 11:43:47 -0000 1.16.8.3 @@ -58,7 +58,7 @@ for { set j 0 } { $j < $i } { incr j } { append body "     " } - if { $installed_p eq "f" || [file exists "[acs_package_root_dir $package_key]/$path"] || $i < [llength $components] - 1} { + if { $installed_p == "f" || [file exists "[acs_package_root_dir $package_key]/$path"] || $i < [llength $components] - 1} { # Either we're not looking at an installed package, or the file still exists, # so don't use when writing the name. append body [lindex $components $i] @@ -80,7 +80,7 @@   }] - if { $installed_p eq "t" } { + if { $installed_p == "t" } { set server_rel_path "packages/$package_key/$path" if { [apm_file_watchable_p $server_rel_path] } { if { [nsv_exists apm_reload_watch $server_rel_path] } { @@ -118,13 +118,13 @@ } -if { $installed_p eq "t" } { +if { $installed_p == "t" } { append body [subst {" } elseif { [info exists tagged_p] } { - if { $tagged_p eq "t" } { + if { $tagged_p == "t" } { append body [subst { Index: openacs-4/packages/acs-admin/www/apm/version-parameters.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.tcl,v diff -u -N -r1.8.4.4 -r1.8.4.5 --- openacs-4/packages/acs-admin/www/apm/version-parameters.tcl 28 Sep 2013 12:10:01 -0000 1.8.4.4 +++ openacs-4/packages/acs-admin/www/apm/version-parameters.tcl 11 Oct 2013 11:43:47 -0000 1.8.4.5 @@ -84,7 +84,7 @@ } # LARS hack -set sections [lindex [lindex $dimensional_list 0] 3] +set sections [lindex $dimensional_list 0 3] foreach section $sections { if {$section_name eq [lindex $section 0]} { set section_name [lindex $section 1] Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v diff -u -N -r1.20.8.2 -r1.20.8.3 --- openacs-4/packages/acs-admin/www/apm/version-view.tcl 28 Sep 2013 12:10:01 -0000 1.20.8.2 +++ openacs-4/packages/acs-admin/www/apm/version-view.tcl 11 Oct 2013 11:43:47 -0000 1.20.8.3 @@ -77,7 +77,7 @@ lappend prompts $status } elseif { $installed_version_id == $version_id } { set status "This version of the package is installed" - if { $enabled_p eq "t" } { + if { $enabled_p == "t" } { append status " and enabled." set can_disable_p 1 } else { @@ -212,7 +212,7 @@ } } else { append body "None available" - if { $installed_p eq "t" } { + if { $installed_p == "t" } { append body [subst { (generate one now from the filesystem) }] @@ -256,7 +256,7 @@ }] } -if { $installed_p eq "t" } { +if { $installed_p == "t" } { if { $distribution_uri eq "" } { # The distribution tarball was either (a) never generated, or (b) generated on this # system. Allow the user to make a tarball based on files in the filesystem. @@ -283,7 +283,7 @@ append body "

    " - if { $installed_p eq "t" } { + if { $installed_p == "t" } { append body [subst {

  • Uninstall this package from your system (be very careful!) Index: openacs-4/packages/acs-admin/www/auth/authority-set-enabled-p.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority-set-enabled-p.tcl,v diff -u -N -r1.3 -r1.3.10.1 --- openacs-4/packages/acs-admin/www/auth/authority-set-enabled-p.tcl 10 Jan 2007 21:22:00 -0000 1.3 +++ openacs-4/packages/acs-admin/www/auth/authority-set-enabled-p.tcl 11 Oct 2013 11:43:47 -0000 1.3.10.1 @@ -12,7 +12,7 @@ # Make sure we are not shutting out all site-wide-admins from the system set allowed_p 1 -if { $enabled_p eq "f" && ![auth::can_admin_system_without_authority_p -authority_id $authority_id]} { +if { $enabled_p == "f" && ![auth::can_admin_system_without_authority_p -authority_id $authority_id]} { set allowed_p 0 }