More detailed error msg (with stack trace) if a file copy fails.

mhagander · mhagander · commit bdf6b888a858 · 2007-10-03T13:20:40.000Z
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
@@ -3,7 +3,7 @@ package Install;
 #
 # Package that provides 'make install' functionality for msvc builds
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.22 2007/09/27 21:13:11 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.23 2007/10/03 13:20:40 mha Exp $
 #
 use strict;
 use warnings;
@@ -22,9 +22,14 @@ sub lcopy
 	my $src = shift;
 	my $target = shift;
 
-	unlink $target if -f $target;
+        if (-f $target)
+        {
+           unlink $target || confess "Could not delete $target\n";
+        }
+
+	copy($src,$target)
+          || confess "Could not copy $src to $target\n";
 
-	copy($src,$target);
 }
 
 sub Install
@@ -123,8 +128,7 @@ sub CopyFiles
         print ".";
         $f = $basedir . $f;
         die "No file $f\n" if (!-f $f);
-        lcopy($f, $target . basename($f))
-          || croak "Could not copy $f to $target". basename($f). " to $target". basename($f) . "\n";
+        lcopy($f, $target . basename($f));
     }
     print "\n";
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Install;`
`3`	`3`	`#`
`4`	`4`	`# Package that provides 'make install' functionality for msvc builds`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.22 2007/09/27 21:13:11 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.23 2007/10/03 13:20:40 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use strict;`
`9`	`9`	`use warnings;`
`@@ -22,9 +22,14 @@ sub lcopy`
`22`	`22`	`my $src = shift;`
`23`	`23`	`my $target = shift;`
`24`	`24`
`25`		`- unlink $target if -f $target;`
	`25`	`+ if (-f $target)`
	`26`	`+ {`
	`27`	`+ unlink $target \|\| confess "Could not delete $target\n";`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ copy($src,$target)`
	`31`	`+ \|\| confess "Could not copy $src to $target\n";`
`26`	`32`
`27`		`- copy($src,$target);`
`28`	`33`	`}`
`29`	`34`
`30`	`35`	`sub Install`
`@@ -123,8 +128,7 @@ sub CopyFiles`
`123`	`128`	`print ".";`
`124`	`129`	`$f = $basedir . $f;`
`125`	`130`	`die "No file $f\n" if (!-f $f);`
`126`		`- lcopy($f, $target . basename($f))`
`127`		`- \|\| croak "Could not copy $f to $target". basename($f). " to $target". basename($f) . "\n";`
	`131`	`+ lcopy($f, $target . basename($f));`
`128`	`132`	`}`
`129`	`133`	`print "\n";`
`130`	`134`	`}`