* Scripts/cvs-apply: Handle case of an empty patch better.

        * Scripts/cvs-unapply: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9372 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8f1ca40199308029a0b66b13d08227ac8ce1719c..b8dc8c6034ca230b350cc2252be805ed821e60de 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-12  Darin Adler  <darin@apple.com>
+
+        * Scripts/cvs-apply: Handle case of an empty patch better.
+        * Scripts/cvs-unapply: Ditto.
+
 2005-06-12  Darin Adler  <darin@apple.com>
 
         Changes by Michael Gaiman.

diff --git a/WebKitTools/Scripts/cvs-apply b/WebKitTools/Scripts/cvs-apply
index 2127a3ebfefedea3898f2c694231d2283d7319af..ec71cafaf212dace92606278e3e185ac1fe1661b 100755 (executable)
--- a/WebKitTools/Scripts/cvs-apply
+++ b/WebKitTools/Scripts/cvs-apply
@@ -69,6 +69,7 @@ patch($patch);
 sub patch
 {
     my ($patch) = @_;
+    return if !$patch;
     if ($patch !~ /\ndiff -N/) {
         # Standard patch, patch tool can handle this.
         open PATCH, "| patch -p0" or die;

diff --git a/WebKitTools/Scripts/cvs-unapply b/WebKitTools/Scripts/cvs-unapply
index eb9d4fd1858c09ffc13e5c315958c30c72c38d4d..a0963471e6847451308b0483bb1a3467c372271b 100755 (executable)
--- a/WebKitTools/Scripts/cvs-unapply
+++ b/WebKitTools/Scripts/cvs-unapply
@@ -69,6 +69,7 @@ patch($patch);
 sub patch
 {
     my ($patch) = @_;
+    return if !$patch;
     if ($patch !~ /\ndiff -N/) {
         # Standard patch, patch tool can handle this.
         open PATCH, "| patch -p0 -R" or die;