From 3318487d518476135ce978fe3fa3a113ca29295f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com>
Date: Fri, 1 Apr 2022 09:48:12 +0200
Subject: [PATCH] CI: integrate_into_manifest: Fix bug introduced when
splitting functions
---
integrate_into_manifest.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/integrate_into_manifest.py b/integrate_into_manifest.py
index fe7d688f..7ef8ed9d 100755
--- a/integrate_into_manifest.py
+++ b/integrate_into_manifest.py
@@ -135,7 +135,7 @@ def integrate_into_manifest(
# Parse manifest file
try:
with open(manifest_filepath.as_posix(), "r", encoding="utf8") as fp:
- manifest = fp.read_text()
+ manifest = fp.read()
except FileNotFoundError:
sys.exit("ERROR: file '%s' not found in manifest repo" % manifest_file)
@@ -143,7 +143,7 @@ def integrate_into_manifest(
if new_manifest is not None:
# write file
with open(manifest_filepath.as_posix(), "w", encoding="utf8") as fp:
- fp.write_text(new_manifest)
+ fp.write(new_manifest)
manifest_repo.index.add([manifest_file])
else:
# Look for project in SRCREV as it has not been found in the manifest
@@ -154,7 +154,7 @@ def integrate_into_manifest(
)
with open(srcrev_filepath, "r", encoding="utf8") as fp:
- srcrev = fp.read_text()
+ srcrev = fp.read()
new_srcrev = update_srcrev(srcrev, recipe_name, new_revision)
# write file
if new_srcrev is None:
@@ -163,7 +163,7 @@ def integrate_into_manifest(
"no recipe name is specified" % project.path
)
with open(srcrev_filepath.as_posix(), "w", encoding="utf8") as fp:
- fp.write_text(new_manifest)
+ fp.write(new_manifest)
manifest_repo.index.add([srcrev_file])
# Make an API request to create the gitlab.user object
--
GitLab