Changeset 195


Ignore:
Timestamp:
Dec 1, 2004, 3:51:28 PM (20 years ago)
Author:
joergs
Message:

fixes no-auth-cache usage

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dasscm/dasscm

    r193 r195  
    1818#
    1919my $SVN = "svn ";
    20 my $subversion_options = "";
     20my $svnOptions = "";
    2121
    2222#####################################################################
     
    7171                        die "Envirnonment variable DASSCM_USER not set.\nSet DASSCM_USER to your subversion user account.\n";
    7272                }
    73                 $subversion_options .= " --no-auth-cache "
     73                $svnOptions .= " --no-auth-cache "
    7474        } elsif ( ! $DASSCM_USER ) {
    7575                $DASSCM_USER=$USER;
    76         }       
     76        }
     77        $svnOptions .= " --username $DASSCM_USER "     
    7778}
    7879
     
    147148       
    148149        # 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" );
    154156
    155157        copy( $filename_prod, $filename_repo ) or die $!;
     
    167169
    168170        # 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" );
    170172        # TODO: commit (-m)
    171173
     
    182184        (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]);
    183185
    184         system( "$SVN blame --username $DASSCM_USER $subversion_options $filename_repo" );
     186        system( "$SVN blame $svnOptions $filename_repo" );
    185187}
    186188
     
    194196        (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]);
    195197
    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" );
    201204       
    202205        copy( $filename_prod, $filename_repo ) or die $!;
    203206
    204207        # 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" );
    206209        # TODO: commit (-m)
    207210}
Note: See TracChangeset for help on using the changeset viewer.