Changeset 252 for trunk

Timestamp:

Dec 22, 2008, 6:10:02 PM (16 years ago)

Author:

joergs

Message:

added return code, don't require login so often, init creates missing directories, perltidy

Location:

trunk/dasscm

Files:

• dasscm (modified) (18 diffs)
• debian/control (modified) (1 diff)
• debian/rules (modified) (1 diff)

trunk/dasscm/dasscm

@@ -24 +24 @@
 #
 
+my $RETURN_OK  = 0;
+my $RETURN_NOK = 1;
+
 # file to store permissions
 my $permissions_file = "/etc/permissions.d/dasscm.permission_backup";
@@ -29 +32 @@
 # documentation file (for usage)
 my $doc_file = "/usr/share/doc/packages/dasscm/dasscm_howto.txt";
+
+my @COMMANDS_REQUIRE_WRITE = ( 'add', "commit" );
 
 # configuration file
@@ -38 +43 @@
 my $DASSCM_CHECKOUT_USERNAME;
 my $DASSCM_CHECKOUT_PASSWORD;
-
 
 # current directory at program start
@@ -180 +184 @@
     if ($verbose) { print "DASSCM_REPO: " . $DASSCM_REPO . "\n"; }
 
-
     #
     # subversion checkout user
     #
-    if( ! $DASSCM_CHECKOUT_USERNAME ) {
-        fatalerror( 
+    if ( !$DASSCM_CHECKOUT_USERNAME ) {
+        fatalerror(
             "variable DASSCM_CHECKOUT_USERNAME is not defined.",
-            "Use file $config_file to configure it." );
-    }
-
-    if( ! $DASSCM_CHECKOUT_PASSWORD ) {
-        fatalerror( 
+            "Use file $config_file to configure it."
+        );
+    }
+
+    if ( !$DASSCM_CHECKOUT_PASSWORD ) {
+        fatalerror(
             "variable DASSCM_CHECKOUT_PASSWORD is not defined.",
-            "Use file $config_file to configure it." );
-    }
-    
+            "Use file $config_file to configure it."
+        );
+    }
 
     #
@@ -220 +224 @@
         # otherwise USER can be used
         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'" );
+            if (    ( not $DASSCM_USERNAME )
+                and ( grep { m|^$command$| } @COMMANDS_REQUIRE_WRITE ) )
+            {
+
+                #( $command ne "login" ) and ( $command ne "status" ) ) {
+                fatalerror(
+                    "Envirnonment variable DASSCM_USERNAME not set.",
+                    "Set DASSCM_USERNAME to your subversion user account or",
+                    "use 'dasscm login'"
+                );
             }
             $svnOptions .= " --no-auth-cache ";
@@ -376 +388 @@
 }
 
-
-
 sub svn_check_credentials( $$;$$ )
 {
@@ -383 +393 @@
     my $password = shift;
 
-    # check silently are allow user interaction? 
+    # check silently are allow user interaction?
     my $interactive = shift || 0;
 
@@ -389 +399 @@
     #   (do not exit for 'init')
     my $fatalerror = shift || 1;
-
-
 
     print "checking credentials ";
@@ -413 +421 @@
 
     my $rc_update;
-    if( $interactive ) {
-        $rc_update = run_interactive( "$SVN ls --no-auth-cache --username $username --password $password $DASSCM_SVN_REPOSITORY" );
+    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(
+          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 ) {
+            if ($fatalerror) {
                 fatalerror();
             }
@@ -433 +444 @@
     return $rc_update == 0;
 }
-
-
 
 sub svn_update( ;$ )
@@ -562 +571 @@
 
     # checking checkout username/password
-    svn_check_credentials( $DASSCM_CHECKOUT_USERNAME, $DASSCM_CHECKOUT_PASSWORD );
+    svn_check_credentials( $DASSCM_CHECKOUT_USERNAME,
+        $DASSCM_CHECKOUT_PASSWORD );
     print "checkout access okay\n";
 
@@ -594 +604 @@
     my $retcode =
       run_interactive(
-        "cd $DASSCM_LOCAL_REPOSITORY_BASE; $SVN checkout $svnCheckoutCredentials $svnOptions $DASSCM_SVN_REPOSITORY; touch $permissions_file"
+        "cd $DASSCM_LOCAL_REPOSITORY_BASE; $SVN checkout $svnCheckoutCredentials $svnOptions $DASSCM_SVN_REPOSITORY; mkdir -p `dirname $permissions_file`; touch $permissions_file"
       );
 }
@@ -782 +792 @@
     check_env();
 
+    # return code for the shell
+    # default: error
+    my $return_code = $RETURN_NOK;
+
     #
     # update local repository
@@ -833 +847 @@
     } else {
         print "no modified files found in $dir\n";
+        $return_code = $RETURN_OK;
     }
 
     print "\n";
+
+    return $return_code;
 }
 
@@ -891 +908 @@
 #
 
+my $return_code      = $RETURN_OK;
 my $number_arguments = @ARGV;
 
@@ -966 +984 @@
         diff(@ARGV);
     } elsif ( (m/status/i) || (m/st/i) ) {
-        $command = "status";
-        status(@ARGV);
+        $command     = "status";
+        $return_code = status(@ARGV);
     } elsif (m/permissions/i) {
         $command = "permissions";
@@ -975 +993 @@
         usage();
         check_env();
+        $return_code = $RETURN_NOK;
     }
 
@@ -982 +1001 @@
     # activate
     # rm
-}
+
+}
+
+exit $return_code;

trunk/dasscm/debian/control

@@ -8 +8 @@
 Package: dasscm
 Architecture: any
-Depends: subversion, perl, libterm-readkey-perl, libconfig-inifiles-perl
+Depends: subversion, perl, libterm-readkey-perl
 Description: dass configuration management tool
  tools for handling configuration files with subversion

trunk/dasscm/debian/rules

@@ -63 +63 @@
         install -d $(CURDIR)/debian/dasscm/etc
         install -d $(CURDIR)/debian/dasscm/etc/subversion
+        install -d $(CURDIR)/var/lib/dasscm/
         install -m 0755 dasscm $(CURDIR)/debian/dasscm/usr/bin
         install -m 0644 dasscm.conf $(CURDIR)/debian/dasscm/etc