Skip to content

Commit

Permalink
Merge pull request #1443 from camptocamp/backport/1441-to-master
Browse files Browse the repository at this point in the history
[Backport master] Fix dump error with version like '1:3.1'
  • Loading branch information
sbrunner authored Dec 6, 2023
2 parents a1be3a1 + c2979bb commit 22a2ff8
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions c2cciutils/scripts/docker_versions_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import subprocess # nosec
import sys

import ruamel.yaml
import yaml

import c2cciutils

Expand All @@ -18,9 +18,8 @@ def main() -> None:
args = argparser.parse_args()

cache: dict[str, dict[str, str]] = {}
yaml = ruamel.yaml.YAML() # default_flow_style=False)
with open("ci/dpkg-versions.yaml", encoding="utf-8") as versions_file:
versions_config = yaml.load(versions_file)
versions_config = yaml.load(versions_file, Loader=yaml.SafeLoader)
for versions in versions_config.values():
for package_full in versions.keys():
dist, package = package_full.split("/")
Expand Down Expand Up @@ -71,7 +70,7 @@ def main() -> None:
versions[package_full] = cache[dist][package]

with open("ci/dpkg-versions.yaml", "w", encoding="utf-8") as versions_file:
yaml.dump(versions_config, versions_file)
yaml.dump(versions_config, versions_file, Dumper=yaml.SafeDumper)

current_branch = c2cciutils.get_branch(args.branch)
has_diff = c2cciutils.create_pull_request_if_needed(
Expand Down

0 comments on commit 22a2ff8

Please sign in to comment.