diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-05-24 16:18:51 +1200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-25 07:50:16 +0100 |
commit | 93a1c016661567292d52bb8a6d3e77f486f5febd (patch) | |
tree | 58d23baf25c3b6342a24ccd3ab7aa0d2cd61e0c1 /scripts/lib/devtool/package.py | |
parent | ab227452c79eda9a30c1461a2b611b2453e0c650 (diff) | |
download | poky-93a1c016661567292d52bb8a6d3e77f486f5febd.tar.gz |
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.
(From OE-Core rev: 2a76be958432a35a0de30e9a5433089a54a06cad)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/package.py')
0 files changed, 0 insertions, 0 deletions