From 85ffd9a27da104698b3ee433aaf0ffb0cb13504e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Sat, 26 Mar 2022 10:18:10 +0100 Subject: [PATCH] phase2: fix just another byte/string inconsistencies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit File "/phase2/master.cfg", line 203, in parse_feed_entry if parts[0].startswith("src-git"): builtins.TypeError: startswith first arg must be bytes or a tuple of bytes, not str Fixes: f3fcdbec877e ("phase2: fix obsolete assumption about feed methods") Signed-off-by: Petr Å tetiar --- phase2/master.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phase2/master.cfg b/phase2/master.cfg index eb9c37f..8b7df6a 100644 --- a/phase2/master.cfg +++ b/phase2/master.cfg @@ -212,9 +212,9 @@ make = subprocess.Popen(['make', '--no-print-directory', '-C', work_dir+'/source line = make.stdout.readline() if line: - parse_feed_entry(line) + parse_feed_entry(str(line, 'utf-8')) -with open(work_dir+'/source.git/feeds.conf.default', 'r') as f: +with open(work_dir+'/source.git/feeds.conf.default', 'r', encoding='utf-8') as f: for line in f: parse_feed_entry(line) -- 2.30.2