Fix up spacing issues; thanks Niels.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
debian
Adam D. Barratt 13 years ago
parent 3b876e743e
commit ba0cdde697

@ -818,7 +818,7 @@ class Britney:
self.__log("Overriding %s[%s] = %s with %s" % (x, package, z[package], hint.version), type="W") self.__log("Overriding %s[%s] = %s with %s" % (x, package, z[package], hint.version), type="W")
for other in [y for y in hints[x] if y.package==package and y.version==z[package]]: for other in [y for y in hints[x] if y.package==package and y.version==z[package]]:
other.set_active(False) other.set_active(False)
z[package] = hint.version z[package] = hint.version
# Sanity check the hints hash # Sanity check the hints hash
@ -1278,7 +1278,7 @@ class Britney:
for block_cmd in blocked: for block_cmd in blocked:
unblock_cmd = "un" + block_cmd unblock_cmd = "un" + block_cmd
unblocks = self.hints.search(unblock_cmd, package=src) unblocks = self.hints.search(unblock_cmd, package=src)
if unblocks and self.same_source(unblocks[0].version, source_u[VERSION]): if unblocks and self.same_source(unblocks[0].version, source_u[VERSION]):
excuse.addhtml("Ignoring %s request by %s, due to %s request by %s" % excuse.addhtml("Ignoring %s request by %s, due to %s request by %s" %
(block_cmd, blocked[block_cmd].user, unblock_cmd, unblocks[0].user)) (block_cmd, blocked[block_cmd].user, unblock_cmd, unblocks[0].user))

@ -39,7 +39,7 @@ class MigrationItem:
else: else:
isequal = self.version == other.version isequal = self.version == other.version
return isequal return isequal
def __hash__(self): def __hash__(self):
return hash((self.uvname, self.version)) return hash((self.uvname, self.version))
@ -77,7 +77,7 @@ class MigrationItem:
if self.is_removal: if self.is_removal:
self._suite = 'testing' self._suite = 'testing'
parts = self._name.split('/', 3) parts = self._name.split('/', 3)
is_removal = self.is_removal is_removal = self.is_removal
if len(parts) == 1 or self._architecture == 'source': if len(parts) == 1 or self._architecture == 'source':

Loading…
Cancel
Save