[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 964f30d8b1ef92f32d1c4e9ee880f7b9a6165fb3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 21:12:04 2010 +0000

    2010-01-29  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Darin Adler.
    
            prepare-ChangeLog outputs useless messages for a nonexistent bug ID
            https://bugs.webkit.org/show_bug.cgi?id=34313
    
            * Scripts/prepare-ChangeLog:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54076 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d1d046e..13d56b4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-29  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        prepare-ChangeLog outputs useless messages for a nonexistent bug ID
+        https://bugs.webkit.org/show_bug.cgi?id=34313
+
+        * Scripts/prepare-ChangeLog:
+
 2010-01-29  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 57743e7..3350aa3 100755
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -257,7 +257,11 @@ if ($bugNumber) {
     my $bugXMLURL = "$bugURL&ctype=xml";
     # Perl has no built in XML processing, so we'll fetch and parse with curl and grep
     my $descriptionLine = `curl --silent "$bugXMLURL" | grep short_desc`;
-    $descriptionLine =~ /<short_desc>(.*)<\/short_desc>/;
+    if ($descriptionLine !~ /<short_desc>(.*)<\/short_desc>/) {
+        print STDERR "  Bug $bugNumber has no bug description. Maybe you set wrong bug ID?\n";
+        print STDERR "  The bug URL: $bugXMLURL\n";
+        exit 1;
+    }
     $bugDescription = decodeEntities($1);
     print STDERR "  Description from bug $bugNumber:\n    \"$bugDescription\".\n";
 }

-- 
WebKit Debian packaging