From 601977320199a535378d41eed8d6e40a2dd30c5d Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Sun, 21 Jun 2020 18:19:11 +0300 Subject: [PATCH] Bugfix: --checklist flag works both with --upgrade option #129 Signed-off-by: Dimitris Zlatanidis --- ChangeLog.txt | 4 ++++ README.md | 2 +- slpkg/__metadata__.py | 2 +- slpkg/main.py | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 39edb94c..3a27988d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,7 @@ +3.9.0 - 21/06/2020 +BugFix: +- Fixed --checklist flag works both with --upgrade option + 3.8.9 - 03/06/2020 BugFix: - Fixed Slackware distribution --upgrade flag diff --git a/README.md b/README.md index 1d2f74a3..caa797e6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# slpkg 3.8.9 +# slpkg 3.9.0 Slpkg is a powerful software package manager that installs, updates, and removes packages on [Slackware](http://www.slackware.com/) based systems. It automatically computes dependencies and diff --git a/slpkg/__metadata__.py b/slpkg/__metadata__.py index 5940e810..ab3314bf 100644 --- a/slpkg/__metadata__.py +++ b/slpkg/__metadata__.py @@ -76,7 +76,7 @@ class MetaData: __all__ = "slpkg" __author__ = "dslackw" - __version_info__ = (3, 8, 9) + __version_info__ = (3, 9, 0) __version__ = "{0}.{1}.{2}".format(*__version_info__) __license__ = "GNU General Public License v3 (GPLv3)" __email__ = "d.zlatanidis@gmail.com" diff --git a/slpkg/main.py b/slpkg/main.py index d86ea0a2..22ed0dc4 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -309,6 +309,12 @@ class ArgParse(BlackList): "--rebuild" ] flag, skip = self.__pkg_upgrade_flags(flags) + + # Remove --checklist flag from args so that works with + # both conditions + if flags[3] in self.args: + self.args.remove(flags[3]) + if (len(self.args) == 3 and self.args[0] in options and self.args[2] == flags[0] and self.args[1] in self.meta.repositories):