Changeset 195
- Timestamp:
- Dec 1, 2004, 3:51:28 PM (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dasscm/dasscm
r193 r195 18 18 # 19 19 my $SVN = "svn "; 20 my $s ubversion_options = "";20 my $svnOptions = ""; 21 21 22 22 ##################################################################### … … 71 71 die "Envirnonment variable DASSCM_USER not set.\nSet DASSCM_USER to your subversion user account.\n"; 72 72 } 73 $s ubversion_options .= " --no-auth-cache "73 $svnOptions .= " --no-auth-cache " 74 74 } elsif ( ! $DASSCM_USER ) { 75 75 $DASSCM_USER=$USER; 76 } 76 } 77 $svnOptions .= " --username $DASSCM_USER " 77 78 } 78 79 … … 147 148 148 149 # update complete repository 149 (my $retcode, my @result)=run_command( "$SVN update $DASSCM_REPO" ); 150 if( $retcode != 0 ) { 151 print @result; 152 die; 153 } 150 # (my $retcode, my @result)=run_command( "$SVN update $DASSCM_REPO" ); 151 # if( $retcode != 0 ) { 152 # print @result; 153 # die; 154 # } 155 system( "$SVN update $svnOptions $DASSCM_REPO" ); 154 156 155 157 copy( $filename_prod, $filename_repo ) or die $!; … … 167 169 168 170 # commit calls $EDITOR. uses "system" here, to display output 169 system( "$SVN commit --username $DASSCM_USER $subversion_options $DASSCM_REPO" );171 system( "$SVN commit $svnOptions $DASSCM_REPO" ); 170 172 # TODO: commit (-m) 171 173 … … 182 184 (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]); 183 185 184 system( "$SVN blame --username $DASSCM_USER $subversion_options $filename_repo" );186 system( "$SVN blame $svnOptions $filename_repo" ); 185 187 } 186 188 … … 194 196 (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]); 195 197 196 (my $rc_update, my @result)=run_command( "$SVN update $filename_repo" ); 197 if( $rc_update != 0 ) { 198 print @result; 199 die; 200 } 198 # (my $rc_update, my @result)=run_command( "$SVN update $filename_repo" ); 199 # if( $rc_update != 0 ) { 200 # print @result; 201 # die; 202 # } 203 system( "$SVN update $svnOptions $DASSCM_REPO" ); 201 204 202 205 copy( $filename_prod, $filename_repo ) or die $!; 203 206 204 207 # commit calls $EDITOR. uses "system" here, to display output 205 system( "$SVN commit --username $DASSCM_USER $subversion_options $filename_repo" );208 system( "$SVN commit $svnOptions $filename_repo" ); 206 209 # TODO: commit (-m) 207 210 }
Note:
See TracChangeset
for help on using the changeset viewer.