From 3e4dea096662a6274e861ef963f95052ad9c069b Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Thu, 2 Jun 2022 00:06:57 +0300 Subject: [PATCH] Updated for version 4.0.2 --- ChangeLog.txt | 5 +++++ README.rst | 8 ++++---- man/slpkg.8 | 2 -- man/slpkg.html | 4 ---- slpkg/__metadata__.py | 2 +- slpkg/arguments.py | 2 -- slpkg/binary/install.py | 12 ------------ slpkg/main.py | 1 - slpkg/sbo/dependencies.py | 2 ++ slpkg/sbo/slackbuild.py | 12 ------------ 10 files changed, 12 insertions(+), 38 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index afff4620..489a39d9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +4.0.2 - 30/05/2022 +Removed: +- Repositories rlw, mles, ktown, rested, slacke, slacky +- Option --directory-prefix + 4.0.1 - 30/05/2022 Added: - SQLAlchemy Object Relational Mapper diff --git a/README.rst b/README.rst index c0a3f2cc..5e91b8f9 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ *********** -slpkg 4.0.1 +slpkg 4.0.2 *********** Slpkg is a powerful software package manager that installs, updates, and removes packages on @@ -35,9 +35,9 @@ Install from the official third party `SBo repository : Download packages without install.

-

--directory-prefix=[path/to/dir/] -: Download packages in specific directory.

- -

--case-ins : Search package name in repository with case insensitive.

diff --git a/slpkg/__metadata__.py b/slpkg/__metadata__.py index 511b2949..ea4852dd 100644 --- a/slpkg/__metadata__.py +++ b/slpkg/__metadata__.py @@ -77,7 +77,7 @@ class MetaData: __all__ = "slpkg" __author__ = "dslackw" - __version_info__ = (4, 0, 1) + __version_info__ = (4, 0, 2) __version__ = "{0}.{1}.{2}".format(*__version_info__) __license__ = "GNU General Public License v3 (GPLv3)" __email__ = "d.zlatanidis@gmail.com" diff --git a/slpkg/arguments.py b/slpkg/arguments.py index 3f5a5429..e97d6387 100644 --- a/slpkg/arguments.py +++ b/slpkg/arguments.py @@ -119,7 +119,6 @@ Optional arguments: -s | --sync, [repository] [package...], Sync packages. Install packages --rebuild, --reinstall, directly from remote repositories --resolve-off, --download-only, with all dependencies. - --directory-prefix=[dir], --case-ins, --patches -t | --tracking, [repository] [package], Tracking package dependencies and @@ -201,7 +200,6 @@ def usage(repo, stderr): --resolve-off, --checklist] [-s [repository] [package...], --rebuild, --reinstall, --resolve-off, --download-only, - --directory-prefix=[dir], --case-ins, --patches] [-t [repository] [package], --check-deps, --graph=[type], --case-ins] diff --git a/slpkg/binary/install.py b/slpkg/binary/install.py index aa2a781a..251cb4ce 100644 --- a/slpkg/binary/install.py +++ b/slpkg/binary/install.py @@ -67,7 +67,6 @@ class BinaryInstall(Utils): self.msg = Msg() self.version = self.meta.slack_rel self.tmp_path = self.meta.slpkg_tmp_packages - self.init_flags() self.dwn, self.dep_dwn = [], [] self.install, self.dep_install = [], [] self.comp_sum, self.dep_comp_sum = [], [] @@ -86,17 +85,6 @@ class BinaryInstall(Utils): self.blacklist = BlackList().get() self.matching = False - def init_flags(self): - """Flags initiliazation - """ - for fl in self.flag: - - if fl.startswith("--directory-prefix="): - self.tmp_path = fl.split("=")[1] - - if not self.tmp_path.endswith("/"): - self.tmp_path += "/" - def start(self, is_upgrade): """Installs packages from official Slackware distribution """ diff --git a/slpkg/main.py b/slpkg/main.py index fb0e31b7..995820ae 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -438,7 +438,6 @@ class ArgParse: additional_options = [ "--resolve-off", "--download-only", - "--directory-prefix=", "--case-ins", "--rebuild", "--reinstall", diff --git a/slpkg/sbo/dependencies.py b/slpkg/sbo/dependencies.py index 39907374..b6423592 100644 --- a/slpkg/sbo/dependencies.py +++ b/slpkg/sbo/dependencies.py @@ -27,6 +27,8 @@ from slpkg.blacklist import BlackList class Requires: + """Creates a list of dependencies with + the right order to install""" def __init__(self, name): self.name = name diff --git a/slpkg/sbo/slackbuild.py b/slpkg/sbo/slackbuild.py index e6a12daf..155e095a 100644 --- a/slpkg/sbo/slackbuild.py +++ b/slpkg/sbo/slackbuild.py @@ -65,7 +65,6 @@ class SBoInstall(Utils): self.arch = SBoArch().get() self.build_folder = self.meta.build_path self._SOURCES = self.meta.SBo_SOURCES - self.init_flags() self.unst = ["UNSUPPORTED", "UNTESTED"] self.master_packages = [] self.deps = [] @@ -82,17 +81,6 @@ class SBoInstall(Utils): self.data = SboQuery(name="").names() self.blacklist = BlackList().get() - def init_flags(self): - """Flags initialization - """ - for fl in self.flag: - - if fl.startswith("--directory-prefix="): - self.build_folder = fl.split("=")[1] - - if not self.build_folder.endswith("/"): - self.build_folder += "/" - def start(self, is_upgrade): """Start view, build and install SBo packages """