[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Manage/Website Upgrade.pm,1.14,1.15

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26434/lib/OpenInteract2/Manage/Website

Modified Files:
	Upgrade.pm 
Log Message:
transferring sample files on website upgrades now works as expected -- files with the same content will not be copied; files in the .no_overwrite will not be copied

Index: Upgrade.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/Upgrade.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Upgrade.pm	17 Oct 2004 20:46:34 -0000	1.14
--- Upgrade.pm	5 Dec 2004 20:01:35 -0000	1.15
***************
*** 52,61 ****
      my $widget_dir = catdir( $source_dir, 'sample', 'website', 'template' );
      my $website_dir = $self->param( 'website_dir' );
!     my $copied = OpenInteract2::Config::TransferSample
!                          ->new( $widget_dir )
!                          ->run( $website_dir );
!     foreach my $file ( @{ $copied } ) {
!         $self->_ok( 'copy updated template files', "File $file copied",
!                     filename => $file );
      }
      $self->notify_observers( progress => 'Widget copy complete' );
--- 52,77 ----
      my $widget_dir = catdir( $source_dir, 'sample', 'website', 'template' );
      my $website_dir = $self->param( 'website_dir' );
!     my $transfer = OpenInteract2::Config::TransferSample->new( $widget_dir );
!     $transfer->run( $website_dir );
!     foreach my $file ( @{ $transfer->files_copied } ) {
!         $self->_ok(
!             'copy updated template files',
!             "File $file copied",
!             filename => $file
!         );
!     }
!     foreach my $file ( @{ $transfer->files_skipped } ) {
!         $self->_ok(
!             'copy updated template files',
!             "File $file skipped, marked as read-only",
!             filename => $file
!         );
!     }
!     foreach my $file ( @{ $transfer->files_same } ) {
!         $self->_ok(
!             'copy updated template files',
!             "File $file skipped, source and destination same",
!             filename => $file
!         );
      }
      $self->notify_observers( progress => 'Widget copy complete' );