Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2577/Manage/Website
Modified Files:
InstallPackage.pm
Log Message:
we don't need to read the packages if we're just finding name/version info from the repository...
Index: InstallPackage.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/InstallPackage.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** InstallPackage.pm 13 Mar 2005 18:38:22 -0000 1.18
--- InstallPackage.pm 17 Mar 2005 06:02:22 -0000 1.19
***************
*** 83,87 ****
});
! $self->_setup_context();
my $is_installed = $self->_check_package_exists(
--- 83,87 ----
});
! $self->_setup_context({ skip => 'read packages' });
my $is_installed = $self->_check_package_exists(
***************
*** 135,139 ****
# put this off so we don't load older versions...
! $self->_setup_context();
my $is_installed = $self->_check_package_exists(
--- 135,139 ----
# put this off so we don't load older versions...
! $self->_setup_context({ skip => 'read packages' });
my $is_installed = $self->_check_package_exists(
***************
*** 180,192 ****
my ( $self, $name, $version, $status ) = @_;
my $repository = CTX->repository;
! my $rep_package = $repository->fetch_package( $name );
! if ( $rep_package && $rep_package->version == $version ) {
! $status->{is_ok} = 'yes';
$status->{package} = $name;
$status->{version} = $version;
! $status->{message} =
! sprintf( 'Package %s-%s not upgraded, ' .
! 'this version already installed',
! $name, $version );
return 1;
}
--- 180,192 ----
my ( $self, $name, $version, $status ) = @_;
my $repository = CTX->repository;
! my $info = $repository->get_package_info( $name );
! if ( $info && $info->{version} == $version ) {
! $status->{is_ok} = 'yes';
$status->{package} = $name;
$status->{version} = $version;
! $status->{message} = sprintf(
! 'Package %s-%s not upgraded, this version already installed',
! $name, $version
! );
return 1;
}
|
