Drop builder.conf

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

diff --git a/Makefile.am b/Makefile.am
index 59f99b647213184ce4e68d3d76855bb0d8aaf12f..5fcf1771e53a64b1d3c1ba95fcb5f4d09eabfa39 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -687,7 +687,6 @@ endif
 # ------------------------------------------------------------------------------
 
 dist_configs_DATA = \
-       contrib/config/builder.conf \
        contrib/config/client.conf \
        contrib/config/daemon.conf \
        contrib/config/general.conf

diff --git a/contrib/config/builder.conf b/contrib/config/builder.conf
deleted file mode 100644 (file)
index 1ad0f05..0000000
--- a/contrib/config/builder.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[logger]
-
-# Use a different log file for the builder stuff.
-file = /var/log/pakfire-builder.log
-
-[builder]
-# Select the distribution to build for.
-#distro = ipfire3
-
-# Use ccache in order to build rebuilds in less time.
-# See also the [ccache] section.
-#use_ccache = true
-
-# Create loop devices in build environment.
-#use_loop_devices = true
-
-[ccache]
-# Turn on compression to get more files into the cache.
-#compress = true

diff --git a/src/pakfire/builder.py b/src/pakfire/builder.py
index edb8a164d63839d0cc83e9c47610d00e6e76d052..89ca4b773b823a64e76b33a29fe811a0ed8267a1 100644 (file)
--- a/src/pakfire/builder.py
+++ b/src/pakfire/builder.py
@@ -73,7 +73,7 @@ exit 0
 
 class Builder(object):
        def __init__(self, arch=None, build_id=None, logfile=None, **kwargs):
-               self.config = config.Config("general.conf", "builder.conf")
+               self.config = config.Config("general.conf")
 
                distro_name = self.config.get("builder", "distro", None)
                if distro_name: