On Thu, 17 Feb 2022 at 18:36, Peter Kjellerstedt <[email protected]> wrote: > This seems incorrect since the branch= parameter is always > required nowadays. I would more expect the code to look something > like this: > > if len(get_branch) == 1: > # If srcrev is on only ONE branch, then use that branch > srcbranch = get_branch[0] > elif 'main' in get_branch: > # If srcrev is on multiple branches, then choose 'main' if it > is one of them > srcbranch = 'main' > elif 'master' in get_branch: > # Otherwise choose 'master' if it is one of the branches > srcbranch = 'master' > else:
It has worked fine where the branch is still master; I admit I don't fully understand how this works, but it did help with a failed update where devtool wasn't able to pick 'main' from several branches containing the same SRCREV. Upgrade functionality isn't easy to test as it is made of a million corner cases and runs against a 'live', constantly evolving set of pending updates, so I mostly adjust it from experience with AUH. If this still isn't good enough (as show by actual failed updates), I'll adjust further. Alex
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161850): https://lists.openembedded.org/g/openembedded-core/message/161850 Mute This Topic: https://lists.openembedded.org/mt/89212438/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
