Paul Eggleton 93a1c01666 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>

2016-05-25 07:50:16 +01:00

..

__init__.py

devtool: add configure-help subcommand

2016-01-26 18:05:14 +00:00

build_image.py

devtool: Fix build-sdk when pn doesn't match filename

2016-05-11 10:33:43 +01:00

build_sdk.py

devtool: add build-sdk subcommand

2016-03-07 00:11:38 +00:00

build.py

devtool: categorise and order subcommands in help output

2016-02-21 09:32:42 +00:00

deploy.py

devtool: deploy-target: preserve existing files

2016-02-21 09:32:43 +00:00

package.py

devtool: categorise and order subcommands in help output

2016-02-21 09:32:42 +00:00

runqemu.py

devtool: categorise and order subcommands in help output

2016-02-21 09:32:42 +00:00

sdk.py

devtool: sdk-update: drop support for local updates

2016-05-21 22:24:57 +01:00

search.py

devtool: categorise and order subcommands in help output

2016-02-21 09:32:42 +00:00

standard.py

devtool: modify: call shutdown on tinfoil when done

2016-03-31 23:01:37 +01:00

upgrade.py

devtool: upgrade: tweak conflict handling

2016-05-25 07:50:16 +01:00

utilcmds.py

devtool: configure-help: fix error if do_configure not already run

2016-03-25 10:29:13 +00:00