Changeset 290

Timestamp:

Mar 11, 2009, 7:51:54 AM (16 years ago)

Author:

joergs

Message:

perltidy

File:

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

trunk/dasscm/dasscm

@@ -29 +29 @@
 
 # Nagios return codes
-my $RETURN_WARN = 1;
-my $RETURN_CRIT = 2;
+my $RETURN_WARN    = 1;
+my $RETURN_CRIT    = 2;
 my $RETURN_UNKNOWN = 3;
-
 
 # documentation file (for usage)
@@ -278 +277 @@
 }
 
-
 #
 # normalize path namens:
@@ -288 +286 @@
     my $path = shift || "";
 
-    if( $path =~ m|^/| ) {
+    if ( $path =~ m|^/| ) {
+
         # full path
-        if( -d $path ) {
+        if ( -d $path ) {
+
             # ensure, a directory ends with '/'
             $path .= '/';
         }
-    } elsif( -d cwd() . '/' . $path ) {
-            # ensure, a directory ends with '/'
-            $path .= '/';
+    } elsif ( -d cwd() . '/' . $path ) {
+
+        # ensure, a directory ends with '/'
+        $path .= '/';
     }
 
@@ -304 +305 @@
     return $path;
 }
-
-
 
 #
@@ -330 +329 @@
     # herefore make sure, that if filename is a directory,
     # it will end by "/"
-    $filename_prod = normalize_path( $filename_prod );
+    $filename_prod = normalize_path($filename_prod);
 
     ( my $basename, my $dirname_prod ) = fileparse($filename_prod);
@@ -340 +339 @@
 
     my $dirname_repo  = normalize_path( $DASSCM_REPO . "/" . $dirname_prod );
-    my $filename_repo = normalize_path( "$dirname_repo/$basename" );
+    my $filename_repo = normalize_path("$dirname_repo/$basename");
 
     if ($verbose) {
         print "filename_repo:  " . $filename_repo . "\n";
-        print "dirname_repo:   " . $dirname_repo ."\n";
+        print "dirname_repo:   " . $dirname_repo . "\n";
         print "filename_prod:  " . $filename_prod . "\n";
-        print "dirname_prod:   " . $dirname_prod . "\n"; 
+        print "dirname_prod:   " . $dirname_prod . "\n";
         print "basename:       " . $basename . "\n";
     }
@@ -532 +531 @@
         print @result;
         if ( $rc_update != 0 ) {
-            error( "failed to update local repository ($update_path)" );
+            error("failed to update local repository ($update_path)");
         } elsif ( not $update_path ) {
 
@@ -565 +564 @@
                 my $name = normalize_path($File::Find::name);
                 $name =~ s|^$dirname_repo||;
+
                 #print "($name)\n";# . $File::Find::dir . "\n";
                 if ( not $name ) {
+
                     # name string is empty (top directory).
                     # do nothing
@@ -579 +580 @@
                     push( @links, $name );
                 } elsif ( -d $_ ) {
+
                     #if( $name."/" eq dirname_repo ) {
-                        # directories
-                        push( @dirs, $name );
+                    # directories
+                    push( @dirs, $name );
+
                     #}
                 } elsif ( -f $_ ) {
@@ -590 +593 @@
                     push( @others, $name );
                 }
-            }
+              }
         },
         ($filename_repo)
@@ -598 +601 @@
 }
 
-
-
 sub svn_revert( ;$ )
 {
@@ -616 +617 @@
     my $path = shift || $DASSCM_REPO;
 
-    ( my $rc_update, my @result ) = run_command("$SVN status '$path'" );
+    ( my $rc_update, my @result ) = run_command("$SVN status '$path'");
 
     if ( $rc_update != 0 ) {
@@ -622 +623 @@
         error("failed to receive subversion repository information");
     } else {
-        foreach (@result) { 
-            if( s/^\? +// ) {
+        foreach (@result) {
+            if (s/^\? +//) {
                 chomp;
+
                 # if file is unknown to subversion (line starts with "?")
                 # remove it
                 print "removing $_\n";
-                unlink( $_ );
+                unlink($_);
             }
         }
@@ -661 +663 @@
 
             if ( -d $realfile ) {
+
                 # directory
-                if( !-d "$cvsworkfile" ) {
+                if ( !-d "$cvsworkfile" ) {
+
                     # real is directory, repository is not. This is a problem
                     $changedfiles{"$realfile"} = $cvsworkfile;
@@ -669 +673 @@
                 $removedfiles{"$realfile"} = $cvsworkfile;
             } elsif ( !-r $realfile ) {
+
                 # don't have permission to read the file,
                 # can't check it
@@ -1129 +1134 @@
 
     # return code for the shell
-    my $return_code = $RETURN_OK;
+    my $return_code   = $RETURN_OK;
     my $return_string = "OK: no modified files";
 
@@ -1137 +1142 @@
     # get modified files
     ( my $refChangedFiles, my $refRemovedFiles, my $refUnknownFiles ) =
-      getModifiedFiles( "/" );
+      getModifiedFiles("/");
     my %changedfiles = %{$refChangedFiles};
     my %removedfiles = %{$refRemovedFiles};
@@ -1144 +1149 @@
     if ( %removedfiles or %changedfiles ) {
         $return_string = "Warning: ";
-        if( %changedfiles ) {
-            $return_string .= "changed: " . join( ", ", ( keys %changedfiles ) ) . ". ";
-        }
-        if( %removedfiles ) {
-            $return_string .= "removed: " . join( ", ", ( keys %removedfiles ) ) . ". ";
+        if (%changedfiles) {
+            $return_string .=
+              "changed: " . join( ", ", ( keys %changedfiles ) ) . ". ";
+        }
+        if (%removedfiles) {
+            $return_string .=
+              "removed: " . join( ", ", ( keys %removedfiles ) ) . ". ";
         }
         if (%unknownfiles) {
-            $return_string .= "unknown: " . join( ", ", ( keys %unknownfiles ) ) . ". ";
+            $return_string .=
+              "unknown: " . join( ", ", ( keys %unknownfiles ) ) . ". ";
         }
         $return_code = $RETURN_WARN;
@@ -1160 +1168 @@
     #Unknown
 
-    print $return_string . "\n";
+    print "$return_string\n";
     return $return_code;
 }
-
 
 sub permissions()
@@ -1199 +1206 @@
         } else {
 
-            if( $command eq "permission" ) {
+            if ( $command eq "permission" ) {
+
                 # Pfad für Sicherungsdatei existiert nicht => schreiben auf stdout
                 # Alias Filehandle für stdout erzeugen
                 $return_code = $RETURN_WARN;
-                *OUTFILE = *STDOUT;
+                *OUTFILE     = *STDOUT;
             } else {
+
                 # TODO: improve this. Check for diff?
                 $return_code = $RETURN_CRIT;
@@ -1271 +1280 @@
     }
 
-    $DASSCM_PERMISSION_FILE = $config->{'DASSCM_PERMISSION_FILE'} || "/etc/permissions.d/dasscm.permission_backup";
+    $DASSCM_PERMISSION_FILE = $config->{'DASSCM_PERMISSION_FILE'}
+      || "/etc/permissions.d/dasscm.permission_backup";
 
     # get command line options and store them in options hash
@@ -1323 +1333 @@
         $return_code = check();
     } elsif (m/^permissions$/i) {
-        $command = "permissions";
+        $command     = "permissions";
         $return_code = permissions();
     } elsif (m/^cleanup$/i) {