Changeset 247

Timestamp:

Oct 13, 2008, 6:04:39 PM (16 years ago)

Author:

joergs

Message:

bugfix, better error handling for changing checkout user credentials

File:

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

trunk/dasscm/dasscm

@@ -36 +36 @@
 my $DASSCM_REPOSITORY_NAME;
 my $DASSCM_SVN_REPOSITORY;
+my $DASSCM_CHECKOUT_USERNAME;
+my $DASSCM_CHECKOUT_PASSWORD;
+
 
 # current directory at program start
@@ -201 +204 @@
         if ( "$USER" eq "root" ) {
             if ( ( not $DASSCM_USERNAME ) and ( $command ne "login" ) ) {
-                fatalerror( "Envirnonment variable DASSCM_USERNAME not set.", "Set DASSCM_USERNAME to your subversion user account or", "use 'dasscm login'";
+                fatalerror( "Envirnonment variable DASSCM_USERNAME not set.", "Set DASSCM_USERNAME to your subversion user account or", "use 'dasscm login'" );
             }
             $svnOptions .= " --no-auth-cache ";
@@ -356 +359 @@
 }
 
-sub svn_check_credentials( $$ )
+
+
+sub svn_check_credentials( $$;$$ )
 {
     my $username = shift;
     my $password = shift;
 
-    print "checking credentials ... ";
+    # check silently are allow user interaction? 
+    my $interactive = shift || 0;
+
+    # default: exit program, if repository is not accessable
+    #   (do not exit for 'init')
+    my $fatalerror = shift || 1;
+
+
+
+    print "checking credentials ";
 
     if ( !$username ) {
@@ -370 +384 @@
         fatalerror("no password given");
     }
+
+    print "for " . $username . "@" . $DASSCM_SVN_REPOSITORY . ": ";
 
     # Options for "svn info" are not supported by subversion 1.0.0 (SLES9),
@@ -379 +395 @@
     #print @result;
 
-    ( my $rc_update, my @result ) =
-      run_command(
-        "$SVN ls --non-interactive --no-auth-cache --username $username --password $password $DASSCM_SVN_REPOSITORY"
-      );
-
-    if ( $rc_update != 0 ) {
-        print "\n", @result;
-        fatalerror();
-    }
-
-}
+    my $rc_update;
+    if( $interactive ) {
+        $rc_update = run_interactive( "$SVN ls --no-auth-cache --username $username --password $password $DASSCM_SVN_REPOSITORY" );
+    } else {
+        ( $rc_update, my @result ) =
+        run_command(
+            "$SVN ls --non-interactive --no-auth-cache --username $username --password $password $DASSCM_SVN_REPOSITORY"
+        );
+    
+        if ( $rc_update != 0 ) {
+            print "\n", @result;
+            if( $fatalerror ) {
+                fatalerror();
+            }
+            return;
+        }
+    }
+
+    # return success
+    return $rc_update == 0;
+}
+
+
 
 sub svn_update( ;$ )
@@ -504 +532 @@
         $input_username = <STDIN>;
         chomp($input_username);
+
+        $input_username = $input_username || $DASSCM_USERNAME;
     }
 
     # hidden password input
-    print "Enter DASSCM user password: ";
+    print "Enter password for $input_username: ";
     ReadMode('noecho');
     my $input_password = <STDIN>;
@@ -514 +544 @@
     print "\n";
 
-    svn_check_credentials( $input_username || $DASSCM_USERNAME,
-        $input_password );
+    # checking checkout username/password
+    svn_check_credentials( $DASSCM_CHECKOUT_USERNAME, $DASSCM_CHECKOUT_PASSWORD );
+    print "checkout access okay\n";
+
+    svn_check_credentials( $input_username, $input_password );
 
     #
@@ -856 +889 @@
       $config->{'DASSCM_SVN_REPOSITORY_BASE'} . "/" . $DASSCM_REPOSITORY_NAME;
 
-    my $DASSCM_CHECKOUT_USERNAME = $config->{'DASSCM_CHECKOUT_USERNAME'};
-    my $DASSCM_CHECKOUT_PASSWORD = $config->{'DASSCM_CHECKOUT_PASSWORD'};
+    $DASSCM_CHECKOUT_USERNAME = $config->{'DASSCM_CHECKOUT_USERNAME'};
+    $DASSCM_CHECKOUT_PASSWORD = $config->{'DASSCM_CHECKOUT_PASSWORD'};
 
     #