Changeset 233

Timestamp:

Oct 8, 2008, 3:45:21 PM (16 years ago)

Author:

joergs

Message:

better check file types. Don't try to checkin directories, because they fail. Offer checkin of multiple files

File:

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

trunk/dasscm/dasscm

@@ -81 +81 @@
 }
 
+sub warning(@)
+{
+    print "Warning: " . join( "\n         ", @_ ) . "\n";
+}
+
+sub error(@)
+{
+    print "Error:   " . join( "\n         ", @_ ) . "\n";
+}
+
+sub fatalerror(@)
+{
+    error( @_ );
+    #print "Exiting\n";
+    exit 1
+}
+
 sub check_env()
 {
@@ -156 +173 @@
 sub check_parameter(@)
 {
+    if( not @_ ) {
+        fatalerror( "no files specified. See 'dasscm --help'" );
+    }
 }
 
@@ -165 +185 @@
     }
 
-    -r $filename_prod or die "$filename_prod is not accessable";
+    if( not -r $filename_prod ) {
+        fatalerror( $filename_prod  . " is not accessable" );
+    } elsif( -l $filename_prod ) {
+        my $dest = readlink($filename_prod);
+        # TODO:
+        #   default: disallow, but offer cmd switch to activate
+        #   (or check, if file is already checked in and has been a link before)
+        warning( "'$filename_prod' is a link to '$dest'.", "Please check, if '$dest' should be stored in repository instead" );
+        if( ! -f $dest ) {
+            fatalerror( "link target '$dest' is not a regular file. Giving up" );
+        }
+    } elsif( ! -f $filename_prod ) {
+        fatalerror( $filename_prod . " is not a regular file. Only regular files can be checked in." );
+    }
 
     # TODO: dirname buggy: eg. "/etc/" is reduced to "/",
@@ -480 +513 @@
     svn_update();
 
-    # add file
-    add_helper( $_[0] );
+    # TODO: check all files
+
+    for my $file (@_) {
+        # add file
+        add_helper( $file );
+    }
 
     # create new permissions file