[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
eric at webkit.org
eric at webkit.org
Thu Dec 3 13:20:18 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 3e4aa3882365f2d108d9195760261287dbc99aa0
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 27 10:09:19 2009 +0000
2009-10-27 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
svn-apply can exit(0) even on patch failure
https://bugs.webkit.org/show_bug.cgi?id=29622
* Scripts/svn-apply:
- Add a bunch of "or die" statements, hopefully catching all
possible cases where failure could still exit(0).
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50137 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e6024b1..a12cd4a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,17 @@
Reviewed by Adam Barth.
+ svn-apply can exit(0) even on patch failure
+ https://bugs.webkit.org/show_bug.cgi?id=29622
+
+ * Scripts/svn-apply:
+ - Add a bunch of "or die" statements, hopefully catching all
+ possible cases where failure could still exit(0).
+
+2009-10-27 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
svn-* scripts should share code through VCSUtils.pm
https://bugs.webkit.org/show_bug.cgi?id=30791
diff --git a/WebKitTools/Scripts/svn-apply b/WebKitTools/Scripts/svn-apply
index 3dd167b..4066296 100755
--- a/WebKitTools/Scripts/svn-apply
+++ b/WebKitTools/Scripts/svn-apply
@@ -302,6 +302,7 @@ sub patch($)
unless ($patch =~ m|^Index: ([^\r\n]+)|) {
my $separator = '-' x 67;
warn "Failed to find 'Index:' in:\n$separator\n$patch\n$separator\n";
+ die unless $force;
return;
}
my $fullPath = $1;
@@ -421,10 +422,10 @@ sub scmCopy($$)
{
my ($source, $destination) = @_;
if (isSVN()) {
- system "svn", "copy", $source, $destination;
+ system "svn", "copy", $source, $destination or die;
} elsif (isGit()) {
- system "cp", $source, $destination;
- system "git", "add", $destination;
+ system "cp", $source, $destination or die;
+ system "git", "add", $destination or die;
}
}
@@ -432,9 +433,9 @@ sub scmAdd($)
{
my ($path) = @_;
if (isSVN()) {
- system "svn", "add", $path;
+ system "svn", "add", $path or die;
} elsif (isGit()) {
- system "git", "add", $path;
+ system "git", "add", $path or die;
}
}
@@ -452,6 +453,6 @@ sub scmRemove($)
close SVN;
print $svnOutput if $svnOutput;
} elsif (isGit()) {
- system "git", "rm", "--force", $path;
+ system "git", "rm", "--force", $path or die;
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list