Changeset 802

Timestamp:

Nov 11, 2009, 1:30:06 PM (14 years ago)

Author:

joergs

Message:

replaced File::Copy by system("cp -a") to keep permissions

File:

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

dasscm/trunk/dasscm

@@ -11 +11 @@
 use File::Basename;
 use File::Compare;
-use File::Copy;
+# used system("cp -a"), because File::Copy does not keep permissions 
+#use File::Copy;
 use File::Find;
 use File::stat;
@@ -373 +374 @@
     ) = get_filenames($filename);
 
-    # TODO: are permissions also copied?
-    copy( $filename_prod, $filename_repo )
-      or error "failed to copy $filename_prod to repository: $!";
-}
+    #copy( $filename_prod, $filename_repo )
+    ( my $rc, my @result ) = run_command( "cp -a $filename_prod $filename_repo" );
+    if( $rc != 0 ) {
+        error( "failed to copy $filename_prod to repository: ", @result );
+    }
+
+    # return success
+    return $rc == 0;
+}
+
+
+
+sub copy_file_from_repository_to_system( $ )
+{
+    my $filename = shift;
+
+    (
+        my $basename,
+        my $dirname_prod,
+        my $dirname_repo,
+        my $filename_prod,
+        my $filename_repo
+    ) = get_filenames($filename);
+
+    ( my $rc, my @result ) = run_command( "cp -a $filename_repo $filename_prod" );
+    if( $rc != 0 ) {
+        error( "failed to copy $filename_repo to $filename_prod: ", @result );
+    }
+
+    # return success
+    return $rc == 0;
+}
+
+
 
 #
@@ -869 +900 @@
 
     mkpath($dirname_repo);
-
-    # TODO: are permissions also copied?
-    copy( $filename_prod, $filename_repo )
-      or error "failed to copy $filename_prod to repository: $!";
+    copy_file_to_repository( $filename_prod );
 
     # already checked in?
@@ -1068 +1096 @@
                     mkpath("$real_path");
                 } else {
-                    copy( $removedfiles{"$real_path"}, $real_path )
-                      or error( "failed to copy "
-                          . $removedfiles{"$real_path"} . " to "
-                          . $real_path . ": "
-                          . $! );
+                    copy_file_from_repository_to_system( $real_path );
                 }
             }
@@ -1083 +1107 @@
             # copy files one by one from local repository to system
             for my $real_file ( keys(%changedfiles) ) {
-                copy( $changedfiles{"$real_file"}, $real_file );
+                copy_file_from_repository_to_system( $real_file );
             }