Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes to basic common bootstrap handling code #1499

Merged
merged 1 commit into from Dec 2, 2018
Merged

Minor fixes to basic common bootstrap handling code #1499

merged 1 commit into from Dec 2, 2018

Conversation

ghost
Copy link

@ghost ghost commented Nov 30, 2018

Minor fixes to basic common bootstrap handling code as suggested by @AndreMiras here: #1496 (see the code review comments)

Please note I added normpath without replacing the two code lines after it as suggested in the code review, since that one does something different (not a path normalization, but ensures it is a relative path) and I'm pretty sure it needs to stay in.

Tested, ready for merge

@ghost
Copy link
Author

ghost commented Nov 30, 2018

The prepare_bootstrap line does actually blow up, so I'll have to investigate deeper why exactly the comment suggests it should be there and see if I can fix it. Will report back once I have some more insight

Edit: addressed, see below

@ghost
Copy link
Author

ghost commented Dec 2, 2018

Okay, I have modified this as per @kollivier 's suggestion with the accepted caveat that if a p4a user changes the bootstrap without forcing a clean build, things could break.

Then I tested that the resulting merge request as it is now works fine and builds my app with no problems, and it does! Travis is also happy. Therefore, as far as I'm concerned, this is ready for merge.

@ghost ghost changed the title [WIP] Minor fixes to basic common bootstrap handling code Minor fixes to basic common bootstrap handling code Dec 2, 2018
Copy link
Member

@AndreMiras AndreMiras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looking good, thanks

@AndreMiras AndreMiras merged commit 46cde41 into kivy:master Dec 2, 2018
@ghost ghost deleted the bootstrapminorfix branch December 2, 2018 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant