From: Michael Tremer Date: Sun, 10 Jan 2021 16:30:24 +0000 (+0000) Subject: python: Drop "mode" in main class X-Git-Tag: 0.9.28~1285^2~906 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f530fe71e1f95affa32239961f8964aeca61d736;p=pakfire.git python: Drop "mode" in main class Signed-off-by: Michael Tremer --- diff --git a/src/pakfire/base.py b/src/pakfire/base.py index 15a88ee57..c5d82e5b3 100644 --- a/src/pakfire/base.py +++ b/src/pakfire/base.py @@ -40,7 +40,6 @@ from .i18n import _ class Pakfire(_pakfire.Pakfire): __version__ = PAKFIRE_VERSION - mode = None def __init__(self, path="/", config=None, arch=None, distro=None, cache_path=None, offline=False): _pakfire.Pakfire.__init__(self, path, arch) @@ -58,7 +57,7 @@ class Pakfire(_pakfire.Pakfire): self.check_root_user() # check if we are actually running on an ipfire system - if not self.mode and self.path == "/": + if self.path == "/": self.check_is_ipfire() # Load configuration @@ -354,8 +353,6 @@ class PakfireContext(object): class PakfireBuilder(Pakfire): - mode = "builder" - def __init__(self, distro_name=None, *args, **kwargs): self.distro_name = distro_name @@ -451,8 +448,6 @@ class PakfireBuilder(Pakfire): class PakfireServer(Pakfire): - mode = "server" - def repo_create(self, path, input_paths, name=None, key_id=None, type="binary"): assert type in ("binary", "source",) @@ -474,4 +469,4 @@ class PakfireServer(Pakfire): class PakfireKey(Pakfire): - mode = "key" + pass diff --git a/src/pakfire/repository/__init__.py b/src/pakfire/repository/__init__.py index a8a1e1092..13d5d4b53 100644 --- a/src/pakfire/repository/__init__.py +++ b/src/pakfire/repository/__init__.py @@ -30,7 +30,7 @@ from .. import _pakfire from .. import config from .. import packages -from .local import RepositoryDir, RepositoryBuild +from .local import RepositoryDir from .system import RepositorySystem from ..i18n import _ @@ -52,11 +52,6 @@ class Repositories(object): self.local = self.pakfire.installed_repo = RepositorySystem(self.pakfire) self.add_repo(self.local) - # If we running in build mode, we include our local build repository. - if self.pakfire.mode == "builder": - self.local_build = RepositoryBuild(self.pakfire) - self.add_repo(self.local_build) - self._load_from_configuration(self.pakfire.config) def __iter__(self):