Index: openacs-4/packages/acs-admin/www/apm/package-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-admin/www/apm/package-add-2.tcl 10 Sep 2002 22:21:59 -0000 1.3 +++ openacs-4/packages/acs-admin/www/apm/package-add-2.tcl 24 Jan 2003 12:34:10 -0000 1.4 @@ -89,7 +89,7 @@ summary {Please summarize your package so that users can determine what it is for.} description {Please provide a description of your package so that users can consider using it.} descrption_format {Please indicate if your package is HTML or text.} - package_key_format {The package key should contain only letters, numbers, and hyphens and it must be lowercase.} + package_key_format {The package key should contain only letters, numbers, and hyphens (dashes) and it must be lowercase.} package_id {You must provide an integer key for your package.} version_id {You must provide an integer key for your package version.} } Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl 10 Sep 2002 22:21:59 -0000 1.2 +++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl 24 Jan 2003 12:34:11 -0000 1.3 @@ -22,7 +22,7 @@ } default { - ad_return complaint "Dependency Entry Error" "Depenendencies are either interfaces or requirements." + ad_return complaint "Dependency Entry Error" "Depenendencies are either provided or required." } } apm_package_install_spec $version_id Index: openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl 10 Jan 2003 13:05:44 -0000 1.4 +++ openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl 24 Jan 2003 12:34:11 -0000 1.5 @@ -56,6 +56,15 @@ apm_package_install_spec $version_id if {$upgrade_p} { apm_version_upgrade $version_id + + # The package now provides the new version of itself as interface + db_dml update_version_provides {update apm_package_dependencies + set service_version = :version_name + where version_id = :version_id + and service_uri = (select package_key + from apm_package_versions + where version_id = :version_id) + and dependency_type = 'provides'} } } on_error { ad_return_error "Error" " @@ -65,4 +74,4 @@ " } -ad_returnredirect "version-view?version_id=$version_id" +ad_returnredirect "version-generate-info?version_id=$version_id&write_p=1" Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 23 Jan 2003 17:55:24 -0000 1.26 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 24 Jan 2003 12:33:54 -0000 1.27 @@ -559,6 +559,10 @@ ); end; }] + + # Every package provides by default the service that is the package itself + # This spares the developer from having to visit the dependency page + apm_interface_add $version_id $package_key $version_name }