Update include_multiple_projects_version and fixes around remote revision #43
Conversation
In demo-manifest project, aosp_include_level_1.xml has been modified, the revision has been moved to the remote entry. We must update the expected version in the test: test_include_multiple_projects_version Signed-off-by: Julien Masson <[email protected]>
|
Request review from @david-baylibre |
There was a problem hiding this comment.
Thanks @massonju for the updates
Just a small comment on dict.get()
repo_resource/common.py
Outdated
| @@ -267,10 +267,10 @@ def __add_remote_revision(self, remote, rev): | |||
| self.__remote_revision[remote] = rev | |||
|
|
|||
| def __get_remote_url(self, remote): | |||
| return self.__remote_url[remote] | |||
| return self.__remote_url.get(remote, None) | |||
There was a problem hiding this comment.
Default value is None if value isn't found in Dict, so no need for the None parameter:
https://docs.python.org/3/library/stdtypes.html#dict.get
I don't know Google repo's behaviour if no remote is defined for the project in the manifest. In any case, we use this in the check step only, to compute the manifest version, so it's fine with me.
There was a problem hiding this comment.
Default value is None if value isn't found in Dict, so no need for the None parameter:
https://docs.python.org/3/library/stdtypes.html#dict.get
Yes you're right I can remove the parameter
I don't know Google repo's behaviour if no remote is defined for the project in the manifest. In any case, we use this in the check step only, to compute the manifest version, so it's fine with me.
And yes actually that should not be possible, I will remove the change in this function
repo_resource/common.py
Outdated
|
|
||
| def __get_remote_revision(self, remote): | ||
| return self.__remote_revision[remote] | ||
| return self.__remote_revision.get(remote, None) |
There was a problem hiding this comment.
Same thing with default None
massonju
force-pushed
the
jmasson/fix-revision-remote
branch
from
ae2a94f to
88c3b69
Compare
When we call __get_remote_revision, we should return None if the key is not found instead of raising an exception. Signed-off-by: Julien Masson <[email protected]>
The project branch is set according to: 1. 'revision' entry in the xml or 2. the remote revision of the project or 3. default branch (retrieved by 'default' xml entry) We added the condition 2. because if a project contains a remote different than the default, we must get the revision according to this remote and not the default. Signed-off-by: Julien Masson <[email protected]>
massonju
force-pushed
the
jmasson/fix-revision-remote
branch
from
88c3b69 to
7ac7496
Compare
This PR contains several updates/fixes: