Improve error handling for package conditions and index files. #537
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This improves on the current behavior which treats earlier index files the same as invalid v4 files.
Package conditions may still be evaluated multiple times but now they are at least all using a centralized function to do so. In addition this new function will evaluate format one and two packages with empty context, since these packages have no condtions it is expected that the unconditional packages will always evaluate to True.
dirk-thomas
reviewed
May 14, 2019
* Only evaluate conditions for package format 3 and beyond. * Filter conditions using `is not False` rather than truthiness to allow for evaluated_condition to be None in earlier package formats.
lennonwoo
reviewed
May 17, 2019
| # Earlier formats should have their conditions evaluated with no context so | ||
| # the evaluated_condition is set to True in all cases. | ||
| if package.package_format >= 3: | ||
| package.evaluate_conditions(package_conditional_context(ros_distro)) |
There was a problem hiding this comment.
Accorint to the latest implement of catkin_pkg, the package.evaluate_conditions(package_conditional_context(ros_distro)) would work when package_format equal 2. As we can see from there, the package.evaluate_conditions change the method evaluated_condition of every dependence to dependence object's attribute. Consider we use this attribute lately, I think this function should be also executed when package_format equals 2.
cottsay
approved these changes
Oct 10, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #536 with some improved error messaging and behavior.
In order to release packages with format 3 package.xml files, a v4 rosdistro index is required to provide sufficient context for evaluating package conditions.
To make it clearer that the problem is the index version and not an invalid / unknown distribution_type, an explicit version check and dedicated error message has been added.
For package formats 1 and 2 conditions are evaluated with an empty context so that downstream code will correctly see all fields without conditions as True.