sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[matter] merge_list could be None, make sure it never is

Browse Source
This commit is contained in:
Fabio Erculiani
2014-02-17 21:03:29 +01:00
parent 855afdff1d
commit fc2488e5f7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
matter/matter/builder.py
View File

@@ -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: