From 9da36a9385261692612038e0cab23ba86b5bca66 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 25 Jun 2013 11:54:53 +0100 Subject: [PATCH] Don't crash on unversioned unblock hints. --- britney.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/britney.py b/britney.py index 6b3bb8c..a98291c 100755 --- a/britney.py +++ b/britney.py @@ -1434,13 +1434,17 @@ class Britney(object): unblock_cmd = "un" + block_cmd unblocks = self.hints.search(unblock_cmd, package=src) - if unblocks and self.same_source(unblocks[0].version, source_u[VERSION]): + if unblocks and unblocks[0].version is not None and self.same_source(unblocks[0].version, source_u[VERSION]): excuse.addhtml("Ignoring %s request by %s, due to %s request by %s" % (block_cmd, blocked[block_cmd].user, unblock_cmd, unblocks[0].user)) else: if unblocks: - excuse.addhtml("%s request by %s ignored due to version mismatch: %s" % - (unblock_cmd.capitalize(), unblocks[0].user, unblocks[0].version)) + if unblocks[0].version is None: + excuse.addhtml("%s request by %s ignored due to missing version" % + (unblock_cmd.capitalize(), unblocks[0].user)) + else: + excuse.addhtml("%s request by %s ignored due to version mismatch: %s" % + (unblock_cmd.capitalize(), unblocks[0].user, unblocks[0].version)) excuse.addhtml("Not touching package due to %s request by %s (contact #ubuntu-release if update is needed)" % (block_cmd, blocked[block_cmd].user)) update_candidate = False