From 7972b6f69b8567edf07586a75a10195136d1a13e Mon Sep 17 00:00:00 2001 From: Will Woods Date: Thu, 23 Jan 2014 13:47:53 -0500 Subject: [PATCH] fix traceback for transaction problems with one package (#1047005) It's possible that pkg2 will be None here, so we need to handle that case without crashing. --- fedup/download.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fedup/download.py b/fedup/download.py index abd355d..5dfb986 100644 --- a/fedup/download.py +++ b/fedup/download.py @@ -296,10 +296,15 @@ def format_replacement(po): done = set() for pkg1, pkg2, err in self.po_with_problems: - if (pkg1,pkg2) not in done: + if (pkg1,pkg2) in done: + continue + if pkg2 is not None: problems.append("%s requires %s" % (format_replacement(pkg1), format_replacement(pkg2))) - done.add((pkg1,pkg2)) + else: + problems.append("%s has depsolving problems" % \ + format_replacement(pkg1)) + done.add((pkg1,pkg2)) return problems