From 61f92f0faa9a93b6b6f6cc7cee6436e228f41f08 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Wed, 19 Apr 2023 21:00:58 +0300 Subject: [PATCH] Removed utilities from resolving --- slpkg/binaries/required.py | 4 +--- slpkg/sbos/dependencies.py | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/slpkg/binaries/required.py b/slpkg/binaries/required.py index 63d941ef..498dd8e1 100644 --- a/slpkg/binaries/required.py +++ b/slpkg/binaries/required.py @@ -1,7 +1,6 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- -from slpkg.utilities import Utilities from slpkg.repositories import Repositories @@ -14,7 +13,6 @@ class Required: self.data: dict = data self.name: str = name self.repos = Repositories() - self.utils = Utilities() self.special_repos: list = [ self.repos.salixos_repo_name, @@ -41,7 +39,7 @@ class Required: # Remove requirements that are included as dependencies, # but are not included in the repository. - if req not in list(self.data.keys()) or self.utils.blacklist_pattern(req): + if req not in list(self.data.keys()): required.remove(req) continue diff --git a/slpkg/sbos/dependencies.py b/slpkg/sbos/dependencies.py index 6536c713..79eaf602 100644 --- a/slpkg/sbos/dependencies.py +++ b/slpkg/sbos/dependencies.py @@ -1,9 +1,6 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- -from slpkg.utilities import Utilities - - class Requires: """ Creates a list of dependencies with the right order to install. """ @@ -13,8 +10,6 @@ class Requires: self.data: dict = data self.name: str = name - self.utils = Utilities() - def resolve(self) -> list: """ Resolve the dependencies. """ requires: list[str] = self.data[self.name][7].split() @@ -23,7 +18,7 @@ class Requires: # Remove requirements that are included as dependencies, # but are not included in the repository. - if req not in list(self.data.keys()) or self.utils.blacklist_pattern(req): + if req not in list(self.data.keys()): requires.remove(req) continue