From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Apr 2021 15:56:20 +0000 (+0000)
Subject: builder: Move local repository into configuration
X-Git-Tag: 0.9.28~1285^2~239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6863732c20ba64b3a77e203fd3ffe5277d8fd77a;p=pakfire.git

builder: Move local repository into configuration

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

diff --git a/contrib/config/distros/ipfire3.conf b/contrib/config/distros/ipfire3.conf
index f0eb8c4aa..57d770d62 100644
--- a/contrib/config/distros/ipfire3.conf
+++ b/contrib/config/distros/ipfire3.conf
@@ -29,3 +29,8 @@ description = IPFire 3 - This is a repository for testing stuff.
 enabled = 0
 baseurl = https://pakfire.ipfire.org/repositories/ipfire3/testing/%{arch}
 mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/testing/mirrorlist?arch=%{arch}
+
+[repo:local]
+description	= IPFire 3 locally built packages
+baseurl		= file:///var/lib/pakfire/local/ipfire3/%{arch}
+priority	= 1000
diff --git a/src/pakfire/builder.py b/src/pakfire/builder.py
index 4e42381f4..e85c2971b 100644
--- a/src/pakfire/builder.py
+++ b/src/pakfire/builder.py
@@ -112,13 +112,6 @@ class Builder(object):
 		for i in ("/etc/resolv.conf", "/etc/hosts"):
 			pakfire.copy_in(i, i)
 
-		# Add build repository
-		# XXX this probably belongs somewhere else
-		repo = _pakfire.Repo(pakfire, "@local")
-		repo.baseurl = "file:///var/lib/pakfire/local"
-		print(repo)
-		repo.scan()
-
 		return BuilderContext(pakfire, self)
 
 	def __exit__(self, type, value, traceback):