path: root/meta/recipes-graphics/wayland
diff options
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-05-09 11:30:58 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-05-24 16:17:26 +1200
commit47264e626abd0db3dcd724c89f34f76e75f04436 (patch)
tree35e9297c093ab594e819d3339298872c0dc839ba /meta/recipes-graphics/wayland
parent82db35e40ef7d801b96dc5ac0171085b9135b4a1 (diff)
devtool: upgrade: tweak conflict handling
Make a couple of changes to the rebase operation: 1) Only wrap the actual rebase command in try...except since a failure in any of the other commands should be an error, not a warning 2) If it's a conflict (which unfortunately we can only tell by checking for the keyword "conflict" since git doesn't return error codes based on the type of error) then print a message clarifying that the user needs to resolve the issue themselves to finish the upgrade. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/wayland')
0 files changed, 0 insertions, 0 deletions