Catkin plugin: Use in-snap python instead of OS-provided. #232
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
kyrofa
force-pushed
the
bugfix/1533297/catkin_run_on_rolling
branch
2 times, most recently
from
a5d426f
to
bf88521
Compare
| pattern = re.compile(r'#!.*python') | ||
| for root, directories, files in os.walk(self.rosdir): | ||
| for fileName in files: | ||
| with open(os.path.join(root, fileName), 'r+') as f: |
There was a problem hiding this comment.
I would extract this into a method.
There was a problem hiding this comment.
Which part exactly-- the walking bit?
There was a problem hiding this comment.
first, the code inside the second for.
Then, maybe the two fors too, but this might be too much.
kyrofa
force-pushed
the
bugfix/1533297/catkin_run_on_rolling
branch
from
bf88521
to
4689cc4
Compare
|
|
Once that is fixed you will run into: Due to the global regexing (I guess) |
kyrofa
force-pushed
the
bugfix/1533297/catkin_run_on_rolling
branch
from
4689cc4
to
d090cf7
Compare
|
@sergiusens oops, knew I did that refactor too quickly. And no, the reason roscore has that clean step as well is to avoid just that. |
This works pre-Xenial since python2 is provided on the image. However, it's been removed in Xenial which uncovered this bug. The fix simply rewrites all /usr/bin/python shebangs to use /usr/bin/env python, and also fixes up 10.ros.sh to use python from the path instead of /usr/bin/python. LP: #1533297 Signed-off-by: Kyle Fazzari <kyle@canonical.com>
kyrofa
force-pushed
the
bugfix/1533297/catkin_run_on_rolling
branch
from
d090cf7
to
31b745f
Compare
sergiusens
added a commit
that referenced
this pull request
Jan 15, 2016
Catkin plugin: Use in-snap python instead of OS-provided.
kalikiana
pushed a commit
to kalikiana/snapcraft
that referenced
this pull request
Apr 6, 2017
…n_on_rolling Catkin plugin: Use in-snap python instead of OS-provided.
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.
This works pre-Xenial since python2 is provided on the image. However, it's been removed in Xenial which uncovered this bug. The fix simply rewrites all /usr/bin/python shebangs to use /usr/bin/env python, and also fixes up 10.ros.sh to use python from the path instead of /usr/bin/python.
LP: #1533297