[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0d8ad9684fc28d8f2bab3f7ee338ccd549b235a8
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 28 08:22:16 2009 +0000

    2009-12-28  Adam Barth  <abarth at webkit.org>
    
            Unreviewed "build" fix (with test!).
    
            * Scripts/modules/bugzilla.py:
            * Scripts/modules/bugzilla_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52595 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f8663f9..310eef4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-28  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed "build" fix (with test!).
+
+        * Scripts/modules/bugzilla.py:
+        * Scripts/modules/bugzilla_unittest.py:
+
 2009-12-27  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/modules/bugzilla.py b/WebKitTools/Scripts/modules/bugzilla.py
index f3aa373..9ae031a 100644
--- a/WebKitTools/Scripts/modules/bugzilla.py
+++ b/WebKitTools/Scripts/modules/bugzilla.py
@@ -120,7 +120,7 @@ class Bugzilla(object):
         bug["reporter_email"] = str(soup.find("reporter").string)
         bug["assign_to_email"] = str(soup.find("assigned_to").string)
         bug["cc_emails"] = [str(element.string) for element in soup.findAll('cc')]
-        bug["attachments"] = [self._parse_attachment_element(element, bug_id) for element in soup.findAll('attachment')]
+        bug["attachments"] = [self._parse_attachment_element(element, bug["id"]) for element in soup.findAll('attachment')]
         return bug
 
     def fetch_bug(self, bug_id):
diff --git a/WebKitTools/Scripts/modules/bugzilla_unittest.py b/WebKitTools/Scripts/modules/bugzilla_unittest.py
index b2e6c1c..4f255fc 100644
--- a/WebKitTools/Scripts/modules/bugzilla_unittest.py
+++ b/WebKitTools/Scripts/modules/bugzilla_unittest.py
@@ -141,6 +141,31 @@ class BugzillaTest(unittest.TestCase):
 
 Ignore this bug.  Just for testing failure modes of bugzilla-tool and the commit-queue.</thetext>
           </long_desc>
+          <attachment 
+              isobsolete="0"
+              ispatch="1"
+              isprivate="0"
+          > 
+            <attachid>45548</attachid> 
+            <date>2009-12-27 23:51 PST</date> 
+            <desc>Patch</desc> 
+            <filename>bug-32585-20091228005112.patch</filename> 
+            <type>text/plain</type> 
+            <size>10882</size> 
+            <attacher>mjs at apple.com</attacher> 
+            
+              <token>1261988248-dc51409e9c421a4358f365fa8bec8357</token> 
+              <data encoding="base64">SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
+removed-because-it-was-really-long
+ZEZpbmlzaExvYWRXaXRoUmVhc29uOnJlYXNvbl07Cit9CisKIEBlbmQKIAogI2VuZGlmCg==
+</data>        
+ 
+              <flag name="review"
+                    id="27602"
+                    status="?"
+                    setter="mjs at apple.com"
+               /> 
+          </attachment> 
     </bug>
 </bugzilla>
 """
@@ -150,7 +175,17 @@ Ignore this bug.  Just for testing failure modes of bugzilla-tool and the commit
         "cc_emails" : ["foo at bar.com", "example at example.com"],
         "reporter_email" : "eric at webkit.org",
         "assign_to_email" : "webkit-unassigned at lists.webkit.org",
-        "attachments" : [],
+        "attachments" : [{
+            'name': u'Patch',
+            'url': 'https://bugs.webkit.org/attachment.cgi?id=45548',
+            'is_obsolete': False,
+            'review': u'?',
+            'is_patch': True,
+            'attacher_email': 'mjs at apple.com',
+            'bug_id': 32585,
+            'type': 'text/plain',
+            'id': 45548
+        }],
     }
 
     def _assert_dictionaries_equal(self, actual, expected):

-- 
WebKit Debian packaging