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.

Sign up for GitHub

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

Jump to bottom

fix windows bundle integration test erroring out on LICENSE #907

Merged
merged 1 commit into from
Aug 16, 2023
Merged

fix windows bundle integration test erroring out on LICENSE #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Fast rm sometimes failing due to a rare race condition
* Fix UnicodeEncodeError in non-Unicode terminals by prioritizing stdout encoding
* When listing licenses in `license` command only show licenses of `b2` and its dependencies
* Fix license command failing on Windows when non-UTF8 encoding is the default

## [3.9.0] - 2023-04-28

Expand Down
3 changes: 2 additions & 1 deletion b2/console_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3243,7 +3243,8 @@ def _put_license_text(self, stream: io.StringIO, with_packages: bool = False):
files_table.add_row([file_name, file_content])
stream.write(str(files_table))
stream.write(f'\n\n{NAME} license:\n')
b2_license_file_text = (pathlib.Path(__file__).parent / 'LICENSE').read_text()
b2_license_file_text = (pathlib.Path(__file__).parent /
'LICENSE').read_text(encoding='utf8')
stream.write(b2_license_file_text)

def _put_license_text_for_packages(self, stream: io.StringIO):
Expand Down