britney.py: Avoid some redundancy in auto_hinter()

Signed-off-by: Niels Thykier <niels@thykier.net>
debian
Niels Thykier 10 years ago
parent 2f663fa7b9
commit 74060e4e0a

@ -2767,11 +2767,11 @@ class Britney(object):
if e not in excuses: if e not in excuses:
return False return False
excuse = excuses[e] excuse = excuses[e]
if e in self.sources['testing'] and self.sources['testing'][e][VERSION] == excuse.ver[1]: if e in sources_t and sources_t[e][VERSION] == excuse.ver[1]:
return True return True
if not circular_first: if not circular_first:
hint[e] = excuse.ver[1] hint[e] = excuse.ver[1]
if len(excuse.deps) == 0: if not excuse.deps:
return hint return hint
for p in excuse.deps: for p in excuse.deps:
if p in hint: continue if p in hint: continue
@ -2784,9 +2784,9 @@ class Britney(object):
mincands = [] mincands = []
for e in excuses: for e in excuses:
excuse = excuses[e] excuse = excuses[e]
if e in self.sources['testing'] and self.sources['testing'][e][VERSION] == excuse.ver[1]: if e in sources_t and sources_t[e][VERSION] == excuse.ver[1]:
continue continue
if len(excuse.deps) > 0: if excuse.deps:
hint = find_related(e, {}, True) hint = find_related(e, {}, True)
if isinstance(hint, dict) and e in hint and hint not in candidates: if isinstance(hint, dict) and e in hint and hint not in candidates:
candidates.append(hint.items()) candidates.append(hint.items())

Loading…
Cancel
Save