Merge lp:~mabac/svammel/two-small-fixes into lp:svammel

[Mattias Backman]

Hi,

This branch fixes bug 791642 and bug 791644 which where found and fixed by rsalveti.

Thanks,

Mattias

[Ricardo Salveti (rsalveti)]

Tested with my previous log and it's now working fine.

Thanks for the fixes!

review: Approve

[Ricardo Salveti (rsalveti)]

$ python file-failures.py -vvvv --archive primary --series oneiric --logfile 010611.log --dryrun
...
DEBUG:Svammel:Getting build record for kdeplasma-addons.
DEBUG:Svammel:Getting build log for kdeplasma-addons.
DEBUG:Svammel:Downloading contents of https://launchpad.net/ubuntu/+source/kdeplasma-addons/4:4.6.3-1ubuntu1/+build/2551233/+files/buildlog_ubuntu-oneiric-armel.kdeplasma-addons_4%3A4.6.3-1ubuntu1_FAILEDTOBUILD.txt.gz
DEBUG:Svammel:Processing build log for kdeplasma-addons.
DEBUG:Svammel:Creating pattern matchers for setting tags.
DEBUG:Svammel:Extra bug tags [].
DEBUG:Svammel:Creating log pattern matchers.
DEBUG:Svammel:Applying log file matchers.
DEBUG:Svammel:Matcher 'Source-dependencies not satisfied' triggered on line 444.
INFO:Svammel:Will file bug for kdeplasma-addons version 4:4.6.3-1ubuntu1 with tags: ['ftbfs', 'arm-porting-queue']
INFO:Svammel: ... but didn't since dryrun is specified.
...
DEBUG:Svammel:Done getting 'Successfully built' builds for source 'pidgin-musictracker'
INFO:Svammel:Had reason to close the bugtask https://bugs.launchpad.net/ubuntu/+source/pidgin-musictracker/+bug/791324 but didn't since dryrun is specified.

[James Westby (james-w)]

review: Approve

=== modified file 'data_parsing.py'
--- data_parsing.py	2011-04-26 12:57:19 +0000
+++ data_parsing.py	2011-06-07 13:39:59 +0000
@@ -205,7 +205,8 @@
         # Get list of successful builds for the same package
         # only when checking in other archives than where
         # this record came from.
-        if fail_build_record.archive.name == archive.name:
+        if (fail_build_record is not None and
+            fail_build_record.archive.name == archive.name):
             continue
 
         success_list = get_build_list(archive, SUCCESS_BUILD_STATE,

=== modified file 'file-failures.py'
--- file-failures.py	2011-04-26 12:57:19 +0000
+++ file-failures.py	2011-06-07 13:39:59 +0000
@@ -172,8 +172,7 @@
             close_bug_by_url(log_entry.bugtask_url, new_status,
                              get_launchpad())
         else:
-            bug = get_launchpad().load(log_entry.bugtask_url)
-            for bug_task in bug.bug_tasks:
-                logger.info("Had reason to close the bugtask %s but " \
-                                "didn't since dryrun is specified." % \
-                                bug_task.web_link)
+            bug_task = get_launchpad().load(log_entry.bugtask_url)
+            logger.info("Had reason to close the bugtask %s but " \
+                            "didn't since dryrun is specified." % \
+                            bug_task.web_link)