[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aa at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit a8e1274b35eff055eaf6803713b7f03330c1ddfb
Author: aa at chromium.org <aa at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 17:12:43 2010 +0000

    2010-08-04  Aaron Boodman  <aa at chromium.org>
    
            Reviewed by Eric Seidel.
    
            prepare-ChangeLog fails mysteriously if curl doesn't support ssl
            https://bugs.webkit.org/show_bug.cgi?id=43460
    
            * Scripts/prepare-ChangeLog:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64654 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ebbf08b..c9d714e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-04  Aaron Boodman  <aa at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        prepare-ChangeLog fails mysteriously if curl doesn't support ssl
+        https://bugs.webkit.org/show_bug.cgi?id=43460
+
+        * Scripts/prepare-ChangeLog:
+
 2010-08-03  MORITA Hajime  <morrita at google.com>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 2ef1eb4..1488939 100755
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -264,8 +264,16 @@ if ($bugNumber) {
     # care about validating that bugs.webkit.org is who it says it is here.
     my $descriptionLine = `curl --insecure --silent "$bugXMLURL" | grep 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";
+        # Maybe the reason the above did not work is because the curl that is installed doesn't
+        # support ssl at all.
+        if (`curl --version | grep ^Protocols` !~ /\bhttps\b/) {
+            print STDERR "  Could not get description for bug $bugNumber.\n";
+            print STDERR "  It looks like your version of curl does not support ssl.\n";
+            print STDERR "  If you are using macports, this can be fixed with sudo port install curl+ssl.\n";
+        } else {
+            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);

-- 
WebKit Debian packaging