From 3fdaa9f74528bf95b57430b95b00bd5b5bac591c Mon Sep 17 00:00:00 2001
From: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
Date: Mon, 8 May 2023 11:58:22 +0300
Subject: [PATCH] Updated for build tag

---
 slpkg/main.py               | 4 +++-
 slpkg/upgrade.py            | 4 +++-
 slpkg/utilities.py          | 7 +++++--
 slpkg/views/view_package.py | 2 +-
 tests/test_utilities.py     | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/slpkg/main.py b/slpkg/main.py
index b8f663d9..406feb97 100644
--- a/slpkg/main.py
+++ b/slpkg/main.py
@@ -465,7 +465,9 @@ class Argparse(Configs):
                         else:
                             repo_ver: str = self.data[package][2]
                             repo_location: str = self.data[package][0]
-                            repo_build_tag: str = self.utils.read_sbo_build_tag(package, repo_location)
+                            repo_build_tag: str = self.utils.read_slackbuild_build_tag(
+                                package, repo_location, self.repository
+                            )
 
                         choices.extend([(package, f'{split_inst_pkg[1]} -> {repo_ver}', True,
                                          f'Installed: {package}-{split_inst_pkg[1]} Build: {split_inst_pkg[3]} -> '
diff --git a/slpkg/upgrade.py b/slpkg/upgrade.py
index 4b0b43d4..4037858c 100644
--- a/slpkg/upgrade.py
+++ b/slpkg/upgrade.py
@@ -57,7 +57,9 @@ class Upgrade(Configs):
             else:
                 repo_version: str = self.data[name][2]
                 repo_location: str = self.data[name][0]
-                repo_build: str = self.utils.read_sbo_build_tag(name, repo_location)
+                repo_build: str = self.utils.read_slackbuild_build_tag(
+                    name, repo_location, self.repository
+                )
 
         repo_pkg: str = f'{name}-{repo_version}'
         inst_pkg: str = f'{name}-{inst_version}'
diff --git a/slpkg/utilities.py b/slpkg/utilities.py
index 19b67ec4..3e2a304a 100644
--- a/slpkg/utilities.py
+++ b/slpkg/utilities.py
@@ -20,6 +20,8 @@ from slpkg.logging_config import LoggingConfig
 class Utilities(Configs):
 
     def __init__(self):
+        super(Configs, self).__init__()
+
         self.black = Blacklist()
         self.errors = Errors()
         self.repos = Repositories()
@@ -83,11 +85,12 @@ class Utilities(Configs):
               time.strftime(f'{self.cyan}%H:%M:%S{self.endc}',
                             time.gmtime(elapsed_time)))
 
-    def read_sbo_build_tag(self, sbo: str, location: str) -> str:
+    def read_slackbuild_build_tag(self, sbo: str, location: str, repository: str) -> str:
         """ Returns build tag from .SlackBuild file. """
         build: str = ''
 
-        sbo_script = Path(self.repos.sbo_repo_path, location, sbo, f'{sbo}.SlackBuild')
+        sbo_script = Path(self.repos.repositories[repository][1], location, sbo, f'{sbo}.SlackBuild')
+        # sbo_script = Path(self.repos.sbo_repo_path, location, sbo, f'{sbo}.SlackBuild')
 
         if sbo_script.is_file():
             lines = self.read_file(sbo_script)
diff --git a/slpkg/views/view_package.py b/slpkg/views/view_package.py
index 201f5615..838dd903 100644
--- a/slpkg/views/view_package.py
+++ b/slpkg/views/view_package.py
@@ -49,7 +49,7 @@ class ViewPackage(Configs):
                     path = Path(self.repos.repositories[self.repository][1], location, name, f'{name}.info')
                     info_file = self.utils.read_file(path)
 
-                    repo_build_tag = self.utils.read_sbo_build_tag(name, location, self.repository)
+                    repo_build_tag = self.utils.read_slackbuild_build_tag(name, location, self.repository)
                     mirror: str = self.repos.repositories[self.repository][2][0]
 
                     maintainer, email, homepage = '', '', ''
diff --git a/tests/test_utilities.py b/tests/test_utilities.py
index a57e8b90..9e0956f6 100644
--- a/tests/test_utilities.py
+++ b/tests/test_utilities.py
@@ -37,7 +37,7 @@ class TestUtilities(unittest.TestCase):
         self.assertIn(self.package, self.utils.installed_packages.values())
 
     def test_read_build_tag(self):
-        self.assertEqual('1', self.utils.read_sbo_build_tag('slpkg', 'system'))
+        self.assertEqual('1', self.utils.read_slackbuild_build_tag('slpkg', 'system'))
 
     def test_is_option(self):
         self.assertTrue(True, self.utils.is_option(['-P', '--parallel'],