Skip to content

Commit

Permalink
Merge pull request Backblaze#907 from reef-technologies/fix_win_bundle
Browse files Browse the repository at this point in the history
fix windows bundle integration test erroring out on LICENSE
  • Loading branch information
ppolewicz committed Aug 16, 2023
2 parents a478fb0 + a033acb commit 6e18aaf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
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
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

0 comments on commit 6e18aaf

Please sign in to comment.