From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 23 Oct 2022 20:58:31 +0000 (+0000)
Subject: config: Fix concatenating the configuration
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=414858d95abdcaef074863584965b07260622526;p=pbs.git

config: Fix concatenating the configuration

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/config.py b/src/buildservice/config.py
index c70cef4a..0f738ceb 100644
--- a/src/buildservice/config.py
+++ b/src/buildservice/config.py
@@ -64,14 +64,16 @@ class PakfireConfig(base.Object):
 		"""
 			Generates the configuration file
 		"""
-		lines = []
+		parts = []
 
 		# Add the distro configuration
 		if self.distro:
-			lines += self.distro._make_config(local=local)
+			config = self.distro._make_config(local=local)
+			parts.append(config)
 
 		# Add the repository configurations
 		for repo in self.repos:
-			lines += repo._make_config(local=local)
+			config = repo._make_config(local=local)
+			parts.append(config)
 
-		return "\n".join(lines)
+		return "\n".join(parts)
diff --git a/src/buildservice/distribution.py b/src/buildservice/distribution.py
index 2996771d..066cee47 100644
--- a/src/buildservice/distribution.py
+++ b/src/buildservice/distribution.py
@@ -103,7 +103,7 @@ class Distribution(base.DataObject):
 				"### CUSTOM CONFIG END ###",
 			)
 
-		return lines
+		return "\n".join(lines)
 
 	# Name