From fc2488e5f7ac1c3176edae80729e76a17eafc2a4 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 17 Feb 2014 21:03:29 +0100 Subject: [PATCH] [matter] merge_list could be None, make sure it never is --- matter/matter/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matter/matter/builder.py b/matter/matter/builder.py index 949af5bca..926fc3a7c 100644 --- a/matter/matter/builder.py +++ b/matter/matter/builder.py @@ -859,7 +859,7 @@ class PackageBuilder(object): real_queue_map = dict((pkg.cpv, pkg) for pkg in real_queue) failed_package = None if retval != 0: - merge_list = mtimedb.get("resume", {}).get("mergelist") + merge_list = mtimedb.get("resume", {}).get("mergelist", []) for _merge_type, _merge_root, merge_atom, _merge_act in merge_list: merge_atom = "%s" % (merge_atom,) if failed_package is None: