Skip to content

Commit 2fd03dd

Browse files
committed
Non-native line breaks in dfetch init and dfetch freeze manifests
Fixes #327
1 parent e0926fd commit 2fd03dd

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Release 0.11.0 (unreleased)
2626
* Don't consider ignored files for determining local changes (#350)
2727
* Avoid waiting for user input in ``git`` & ``svn`` commands (#570)
2828
* Extend git ssh command to run in BatchMode (#570)
29+
* Use native line breaks in ``dfetch freeze`` & ``dfetch import`` (#327)
2930

3031
Release 0.10.0 (released 2025-03-12)
3132
====================================

dfetch/manifest/manifest.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,11 @@ def dump(self, path: str) -> None:
328328
"""Dump metadata file to correct path."""
329329
with open(path, "w+", encoding="utf-8") as manifest_file:
330330
yaml.dump(
331-
self._as_dict(), manifest_file, Dumper=ManifestDumper, sort_keys=False
331+
self._as_dict(),
332+
manifest_file,
333+
Dumper=ManifestDumper,
334+
sort_keys=False,
335+
line_break=os.linesep,
332336
)
333337

334338
def find_name_in_manifest(self, name: str) -> ManifestEntryLocation:
@@ -412,12 +416,12 @@ class ManifestDumper(yaml.SafeDumper): # pylint: disable=too-many-ancestors
412416

413417
def write_line_break(self, data: Any = None) -> None:
414418
"""Write a line break."""
415-
super().write_line_break(data) # type: ignore[unused-ignore]
419+
super().write_line_break(data) # type: ignore[unused-ignore, no-untyped-call]
416420

417421
if len(self.indents) == 2 and getattr(self.event, "value", "") != "version":
418-
super().write_line_break() # type: ignore[unused-ignore]
422+
super().write_line_break() # type: ignore[unused-ignore, no-untyped-call]
419423

420424
if len(self.indents) == 3 and self._last_additional_break != 2:
421-
super().write_line_break() # type: ignore[unused-ignore]
425+
super().write_line_break() # type: ignore[unused-ignore, no-untyped-call]
422426

423427
self._last_additional_break = len(self.indents)

0 commit comments

Comments
 (0)