D21643.diff
No OneTemporary
Actions

Size

949 B

Referenced Files

None

Subscribers

None

D21643.diff
View Options

	diff --git a/src/filesystem/Filesystem.php b/src/filesystem/Filesystem.php
	--- a/src/filesystem/Filesystem.php
	+++ b/src/filesystem/Filesystem.php
	@@ -269,7 +269,29 @@
	self::assertReadable($from);

	if (phutil_is_windows()) {
	- execx('copy /Y %s %s', $from, $to);
	+ $trap = new PhutilErrorTrap();
	+ $ok = @copy($from, $to);
	+ $err = $trap->getErrorsAsString();
	+ $trap->destroy();
	+
	+ if (!$ok) {
	+ if (strlen($err)) {
	+ throw new FilesystemException(
	+ $to,
	+ pht(
	+ 'Failed to copy file from "%s" to "%s": %s',
	+ $from,
	+ $to,
	+ $err));
	+ } else {
	+ throw new FilesystemException(
	+ $to,
	+ pht(
	+ 'Failed to copy file from "%s" to "%s".',
	+ $from,
	+ $to));
	+ }
	+ }
	} else {
	execx('cp -p %s %s', $from, $to);
	}