Changeset 195

Timestamp:

Dec 1, 2004, 3:51:28 PM (20 years ago)

Author:

joergs

Message:

fixes no-auth-cache usage

File:

• trunk/dasscm/dasscm (modified) (6 diffs)

trunk/dasscm/dasscm

@@ -18 +18 @@
 #
 my $SVN = "svn ";
-my $subversion_options = "";
+my $svnOptions = "";
 
 #####################################################################
@@ -71 +71 @@
                         die "Envirnonment variable DASSCM_USER not set.\nSet DASSCM_USER to your subversion user account.\n";
                 } 
-                $subversion_options .= " --no-auth-cache "
+                $svnOptions .= " --no-auth-cache "
         } elsif ( ! $DASSCM_USER ) {
                 $DASSCM_USER=$USER;
-        }       
+        }
+        $svnOptions .= " --username $DASSCM_USER "      
 }
 
@@ -147 +148 @@
         
         # update complete repository
-        (my $retcode, my @result)=run_command( "$SVN update $DASSCM_REPO" );
-        if( $retcode != 0 ) {
-                print @result;
-                die;
-        }
+#       (my $retcode, my @result)=run_command( "$SVN update $DASSCM_REPO" );
+#       if( $retcode != 0 ) {
+#               print @result;
+#               die;
+#       }
+        system( "$SVN update $svnOptions $DASSCM_REPO" );
 
         copy( $filename_prod, $filename_repo ) or die $!;
@@ -167 +169 @@
 
         # commit calls $EDITOR. uses "system" here, to display output
-        system( "$SVN commit --username $DASSCM_USER $subversion_options $DASSCM_REPO" );
+        system( "$SVN commit $svnOptions $DASSCM_REPO" );
         # TODO: commit (-m)
 
@@ -182 +184 @@
         (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]);
 
-        system( "$SVN blame --username $DASSCM_USER $subversion_options $filename_repo" );
+        system( "$SVN blame $svnOptions $filename_repo" );
 }
 
@@ -194 +196 @@
         (my $basename, my $dirname_prod, my $dirname_repo, my $filename_prod, my $filename_repo) = get_filenames($_[0]);
 
-        (my $rc_update, my @result)=run_command( "$SVN update $filename_repo" );
-        if( $rc_update != 0 ) {
-                print @result;
-                die;
-        }
+#       (my $rc_update, my @result)=run_command( "$SVN update $filename_repo" );
+#       if( $rc_update != 0 ) {
+#               print @result;
+#               die;
+#       }
+        system( "$SVN update $svnOptions $DASSCM_REPO" );
         
         copy( $filename_prod, $filename_repo ) or die $!;
 
         # commit calls $EDITOR. uses "system" here, to display output
-        system( "$SVN commit --username $DASSCM_USER $subversion_options $filename_repo" );
+        system( "$SVN commit $svnOptions $filename_repo" );
         # TODO: commit (-m)
 }