Merge branch 'develop'

ChangeLog.txt

@@ -1,3 +1,7 @@
+4.3.6 - 08/12/2022
+Fixed:
+- Remove packages
+
 4.3.5 - 07/12/2022
 Updated:
 - Code style
@@ -9,7 +13,7 @@ Updated:
 - Remove dataclasses and switch to __init__
 - Version print command
 Added:
-- Version to the requires in the view packages command
+- Version to the requirements in the view packages command
 - Short cli menu
 
 4.3.3 - 01/12/2022

README.rst

@@ -30,8 +30,8 @@ Install from the official third-party `SBo repository <https://slackbuilds.org/r
 
 .. code-block:: bash
 
-    $ tar xvf slpkg-4.3.5.tar.gz
+    $ tar xvf slpkg-4.3.6.tar.gz
-    $ cd slpkg-4.3.5
+    $ cd slpkg-4.3.6
     $ ./install.sh
 
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = slpkg
-version = 4.3.5
+version = 4.3.6
 license_file = LICENSE
 author = Dimitris Zlatanidis
 author_email = d.zlatanidis@gmail.com

slpkg/checks.py

@@ -42,8 +42,8 @@ class Check:
 
         for sbo in slackbuilds:
             for package in os.listdir(self.configs.log_packages):
-                if (package.startswith(f'{sbo}-') and
+                pkg = '-'.join(package.split('-')[:-3])
-                        package.endswith(self.configs.sbo_repo_tag)):
+                if sbo == pkg and package.endswith(self.configs.sbo_repo_tag):
                     found.append(sbo)
 
         for sbo in slackbuilds:

slpkg/main.py

@@ -24,7 +24,7 @@ from slpkg.update_repository import UpdateRepository
 class Argparse:
 
     def __init__(self, args):
-        self.args: list = args
+        self.args = args
         self.usage = Usage()
 
         if len(self.args) == 0:

slpkg/views/version.py

@@ -6,7 +6,7 @@ class Version:
     """ Print the version. """
 
     def __init__(self):
-        self.version_info: tuple = (4, 3, 5)
+        self.version_info: tuple = (4, 3, 6)
         self.version: str = '{0}.{1}.{2}'.format(*self.version_info)
         self.license: str = 'MIT License'
         self.author: str = 'Dimitris Zlatanidis (dslackw)'

slpkg/views/views.py

@@ -67,7 +67,6 @@ class ViewMessage:
         """ View remove packages. """
         print('The following packages will be removed:\n')
         slackbuilds, dependencies, deps = [], [], []
-
         for pkg in packages:
             self._view_installed_packages(pkg)
             slackbuilds.append(pkg)
@@ -145,10 +144,8 @@ class ViewMessage:
         color = self.colors()
 
         for package in installed:
-            black = package.split('-')[0]
+            pkg = '-'.join(package.split('-')[:-3])
-            if (package.startswith(f'{name}-') and
+            if pkg == name and self.configs.sbo_repo_tag in package and pkg not in self.black.get():
-                self.configs.sbo_repo_tag in package and
-                    black not in self.black.get()):
                 self.installed_packages.append(package)
                 print(f'[{color["red"]} delete {color["endc"]}] -> {package}')