From 0323a97f5f7af9ae2b86b71983ba71073631ec81 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Fri, 7 Nov 2014 05:50:48 +0200 Subject: [PATCH] updated for version 2.0.4 --- README.rst | 7 +++---- man/slpkg.8 | 2 +- slpkg/arguments.py | 2 +- slpkg/main.py | 5 +++-- slpkg/others/check.py | 6 +++--- slpkg/others/remove.py | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.rst b/README.rst index aad8672e..da5ee29c 100644 --- a/README.rst +++ b/README.rst @@ -68,9 +68,8 @@ Features -------- - Build third party packages from source with all dependencies -- Install packages through from official `Slackware `_ mirrors -- Find and Download packages from `slackbuilds.org `_ -- Grabs packages from slackbuilds.org in real time +- Grabs packages from repositories in real time +- Find and Download packages from repositories - Automatic tool build and install packages - Check if your distribution is up to date - Remove packages with all dependencies @@ -135,7 +134,7 @@ Command Line Tool Usage -b, --list, [package...] --add, --remove add, remove packages in blacklist -q, --list, [package...] --add, --remove add, remove packages in queue --build, --install, --build-install build or install from queue - -l, all, sbo, slack, noarch list of installed packages + -l, , all, noarch list of installed packages -c, --upgrade --current check for updated packages -s, --current download, build & install -f, find installed packages diff --git a/man/slpkg.8 b/man/slpkg.8 index 26c18073..b3e42128 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -39,7 +39,7 @@ Optional arguments: -b, --list, [package...] --add, --remove add, remove packages in blacklist -q, --list, [package...] --add, --remove add, remove packages in queue --build, --install, --build-install build or install from queue - -l, all, sbo, slack, noarch list of installed packages + -l, , all, noarch list of installed packages -c, --upgrade --current check for updated packages -s, --current download, build & install -f, find installed packages diff --git a/slpkg/arguments.py b/slpkg/arguments.py index 2b8cfdcb..d21b8a4e 100755 --- a/slpkg/arguments.py +++ b/slpkg/arguments.py @@ -40,7 +40,7 @@ def options(): "queue", " --build, --install, --build-install build or install from " + "queue", - " -l, all, sbo, slack, noarch list of installed " + + " -l, , all, noarch list of installed " + "packages", " -c, --upgrade --current check for updated " + "packages", diff --git a/slpkg/main.py b/slpkg/main.py index cf87979c..3a28b270 100755 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -86,8 +86,9 @@ def main(): usage() elif len(args) == 4 and args[0] == "-c": if args[1] == repository[1] and args[3] == "--current": - version = "current" - Patches(version).start() + Patches("current").start() + elif args[1] == repository[3] and args[3] == "--current": + OthersUpgrade(repository[3], "current").start() else: usage() elif len(args) == 3 and args[0] == "-s": diff --git a/slpkg/others/check.py b/slpkg/others/check.py index c9c14dc1..57d2c942 100755 --- a/slpkg/others/check.py +++ b/slpkg/others/check.py @@ -26,10 +26,10 @@ import sys from sizes import units from repositories import Repo -from init import Initialization -from blacklist import BlackList -from splitting import split_package from messages import template +from blacklist import BlackList +from init import Initialization +from splitting import split_package from colors import YELLOW, GREY, ENDC from __metadata__ import slpkg_tmp, pkg_path, lib_path diff --git a/slpkg/others/remove.py b/slpkg/others/remove.py index 6e8b618e..6ffe71da 100755 --- a/slpkg/others/remove.py +++ b/slpkg/others/remove.py @@ -30,7 +30,7 @@ def delete(path, packages): ''' if os.listdir(path): read = raw_input("Removal downloaded packages [Y/n]? ") - if read == "Y" or read == "y": + if read in ['y', 'Y']: for pkg in packages: os.remove(path + pkg) os.remove(path + pkg + ".asc")