commit 93fbdbd3b38e7dcb286bc35c717c01ee1c6c7f77
Merge: ce0bc5e 0511c07
Author: Thomas Thrainer <[email protected]>
Date: Wed May 14 13:26:15 2014 +0200
Merge branch 'stable-2.9' into stable-2.10
* stable-2.9
On expanding jobs, extend reason trail
Signed-off-by: Thomas Thrainer <[email protected]>
diff --cc lib/mcpu.py
index 5a04805,f27adc9..b29c272
--- a/lib/mcpu.py
+++ b/lib/mcpu.py
@@@ -208,9 -207,13 +208,13 @@@ def _SetBaseOpParams(src, defcomment, d
hasattr(src, "priority")):
dst.priority = src.priority
- if not getattr(dst, opcodes.COMMENT_ATTR, None):
+ if not getattr(dst, opcodes_base.COMMENT_ATTR, None):
dst.comment = defcomment
+ if hasattr(src, constants.OPCODE_REASON):
+ dst.reason = getattr(dst, constants.OPCODE_REASON, [])
+ dst.reason.extend(getattr(src, constants.OPCODE_REASON, []))
+
def _ProcessResult(submit_fn, op, result):
"""Examines opcode result.
