Changeset 225806 in webkit

Timestamp:

Dec 12, 2017 2:23:17 PM (6 years ago)

Author:

Michael Catanzaro

Message:

Don't require perl(File::Copy::Recursive)
​https://bugs.webkit.org/show_bug.cgi?id=180479
<rdar://problem/35944218>

Reviewed by Daniel Bates.

Fix the error handling. I added this at the last moment and failed to test. The logic is
inverted, causing an error to always be reported on success.

Add a missing 'mkdir -p' using File::Path::make_path. This has its own built-in error
reporting, so no need to add our own.

• Scripts/copy-user-interface-resources.pl:

(ditto):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Scripts/copy-user-interface-resources.pl (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-12-12  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Don't require perl(File::Copy::Recursive)
+        https://bugs.webkit.org/show_bug.cgi?id=180479
+        <rdar://problem/35944218>
+
+        Reviewed by Daniel Bates.
+
+        Fix the error handling. I added this at the last moment and failed to test. The logic is
+        inverted, causing an error to always be reported on success.
+
+        Add a missing 'mkdir -p' using File::Path::make_path. This has its own built-in error
+        reporting, so no need to add our own.
+
+        * Scripts/copy-user-interface-resources.pl:
+        (ditto):
+
 2017-12-12  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl

@@ -50 +50 @@
         # Ditto copies the *contents* of the source directory, not the directory itself.
         opendir(my $dh, $source) or die "Can't open $source: $!";
+        make_path($destination);
         while (readdir $dh) {
             if ($_ ne '..' and $_ ne '.') {
-                system('cp', '-R', "${source}/$_", $destination) or die "Failed to copy ${source}/$_ to $destination";
+                system('cp', '-R', "${source}/$_", $destination) == 0 or die "Failed to copy ${source}/$_ to $destination";
             }
         }