Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-18 10:26:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary argument ALL

Browse source 
Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
This commit is contained in:
Dimitris Zlatanidis 2019-01-14 16:34:26 +01:00
parent aca14b32c5
commit 44d16569c1
4 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
EXAMPLES.txt
View file

@ -258,7 +258,7 @@ Also you can check ChangeLog.txt for changes like:
From 1 repositories need 1 updating. Run the command 'slpkg update'.
$ slpkg -c ALL
$ slpkg --check
+==============================================================================
| Repository Status
@ -786,7 +786,7 @@ Use the dialog utility to help you find the packages:
Load all repository:
$ slpkg -n ALL --checklist
$ slpkg -n --checklist
Reading package lists...
.. image:: https://gitlab.com/dslackw/images/raw/master/slpkg/pythondialog5.png
@ -1186,7 +1186,7 @@ Build and install the packages that have added to the queue:
CEGUI
$ slpkg -q roxterm --remove (or 'slpkg -q ALL --remove' remove all packages)
$ slpkg -q roxterm --remove (or 'slpkg -q --remove' remove all packages)
Remove packages from queue:
@ -1220,7 +1220,7 @@ Add or remove the packages in blacklist file manually from
faac
$ slpkg -b speex --remove (or 'slpkg -b ALL --remove' remove all packages)
$ slpkg -b speex --remove (or 'slpkg -b --remove' remove all packages)
Remove packages from blacklist:

24
man/slpkg.8
View file

@ -11,7 +11,7 @@
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" GNU General Public License for more details.
.\"
.TH Slpkg "21" "10" 2019" "slpkg"
.TH Slpkg "14" "01" 2019" "slpkg"
.SH NAME
Slpkg is a user-friendly package manager for Slackware installations
.SH SYNOPSIS
@ -138,7 +138,7 @@ Additional options:
\fBslpkg\fP \fBdeps-status\fP \fB--graph=[type]\fP
.PP
Print dependencies status used by packages. Prerequisite packages have been installed
with the option "slpkg -s <repository> <packages>".
with the option "# slpkg -s <repository> <packages>".
.PP
Additional options:
.PP
@ -168,9 +168,9 @@ checksum from the configuration file.
\fBslpkg\fP \fB-b\fP <\fIname of packages\fP> \fB--add\fP, \fB--remove\fP, \fBlist\fP
.PP
Add, remove or listed packages from blacklist file. The settings here affect
all repositories. Remove all packages from blacklist use argument "ALL" for package
like "# slpkg -b ALL --remove". Use asterisk "*" to match pagkages like "# slpkg -b
py* --add", this add all installed packages with starts string "py" or "# slpkg -b
all repositories. Remove all packages from blacklist use argument like
"# slpkg -b --remove". Use asterisk "*" to match pagkages like "# slpkg -b
py* --add", this add all installed packages with starts string "py" or "# slpkg -b
multi:*multilib* --add", this add all multilib packages from repository "multi".
.SS -q, --queue, add, remove, view packages in queue
@ -180,7 +180,7 @@ multi:*multilib* --add", this add all multilib packages from repository "multi".
.PP
Add, remove and listed sbo packages from queue. This argument is very useful if you want
to build and install multiple packages together. Note the correct order if there are
dependencies. If you want to remove all the packages from the list run "# slpkg -q ALL --remove".
dependencies. If you want to remove all the packages from the list run "# slpkg -q --remove".
(these arguments only working for the sbo repository)
Build or install or build and install packages are queued.
@ -213,7 +213,7 @@ directly with the official repository and so always you can have updated your sy
.PP
Additional options:
.PP
\fB-c ALL\fP : Check ChangeLog.txt files for changes.
\fB-c \fP : Check ChangeLog.txt files for changes.
.PP
\fB--upgrade\fP : Check and install packages for upgrade.
.PP
@ -221,7 +221,7 @@ Additional options:
.PP
\fB--resolve-off\fP : Switch off automatic resolve dependencies.
.PP
\fB--skip=[packages...]\fP : Skip packages from upgrade separate by comma like "slpkg -c sbo --skip=jdk,pep8,pip" (See REGEX).
\fB--skip=[packages...]\fP : Skip packages from upgrade separate by comma like "# slpkg -c sbo --skip=jdk,pep8,pip" (See REGEX).
.PP
\fB--checklist\fP : Enable dialog utility and checklist option. (Require python2-pythondialog)
@ -298,8 +298,8 @@ Additional options:
\fBslpkg\fP \fB-n\fP <\fIname of package\fP>, <\fI[pattern], --checklist\fP>, \fI--case-ins\fP
.PP
View complete slackbuilds.org site in your terminal. Read file, download,
build or install etc. Use 'ALL' in [pattern] and "--checklist" additional option to load all
repository, example "slpkg -n ALL --checklist".
build or install etc. Use "--checklist" additional option to load all repository, example:
"# slpkg -n --checklist".
.PP
Additional options:
.PP
@ -327,7 +327,7 @@ More information please read "man upgradepkg".
Removes a previously installed Slackware package, while writing a progress report to
the standard output. A package may be specified either by the full package name (as
you'd see listed in /var/log/packages/), or by the base package name. If installed
packages with command "slpkg -s <repo> <packages>" then write a file in /var/log/slpkg/dep/
packages with command "# slpkg -s <repo> <packages>" then write a file in /var/log/slpkg/dep/
with all dependencies and it allows you can remove them all together.
More information please read "man removepkg".
.PP
@ -439,7 +439,7 @@ Dimitris Zlatanidis <d.zlatanidis@gmail.com>
.SH HOMEPAGE
https://gitlab.com/dslackw/slpkg
.SH COPYRIGHT
Copyright \(co 2014-2017 Dimitris Zlatanidis
Copyright \(co 2014-2019 Dimitris Zlatanidis
.SH SEE ALSO
installpkg(8), upgradepkg(8), removepkg(8), pkgtool(8), slackpkg(8), explodepkg(8),

20
slpkg/main.py
View file

@ -309,13 +309,13 @@ class ArgParse(object):
else:
Patches(skip, flag).start()
elif self.args[1] == "sbo":
SBoInstall(sbo_upgrade(skip, flag), flag).start(is_upgrade=True)
SBoInstall(sbo_upgrade(skip, flag), flag).start(
is_upgrade=True)
else:
usage(self.args[1])
elif len(self.args) == 2 and self.args[0] in options:
if self.args[1] == "ALL":
elif len(self.args) == 1 and self.args[0] in options:
Updates(repo="").ALL()
else:
elif len(self.args) == 2 and self.args[0] in options:
Updates(self.args[1]).run()
elif (len(self.args) >= 2 and self.args[0] in options and
self.args[1] not in self.meta.repositories):
@ -440,6 +440,10 @@ class ArgParse(object):
if (len(self.args) == 2 and self.args[0] in options and
"sbo" in self.meta.repositories):
SBoNetwork(self.args[1], flag).view()
elif (len(self.args) == 1 and self.args[0] in options and
"sbo" in self.meta.repositories and
additional_options[0] in flag):
SBoNetwork("", flag).view()
else:
usage("sbo")
@ -463,8 +467,8 @@ class ArgParse(object):
flag[0] in self.args):
self.args.remove(flag[0])
blacklist.add(self.args[1:])
elif (len(self.args) == 3 and self.args[0] in options and
"ALL" in self.args and flag[1] in self.args):
elif (len(self.args) == 2 and self.args[0] in options and
flag[1] in self.args):
self.args.remove(flag[1])
blacklist.remove(blacklist.get_black())
elif (len(self.args) > 2 and self.args[0] in options and
@ -496,8 +500,8 @@ class ArgParse(object):
flag[0] in self.args):
self.args.remove(flag[0])
queue.add(self.args[1:])
elif (len(self.args) == 3 and self.args[0] in options and
"ALL" in self.args and flag[1] in self.args):
elif (len(self.args) == 2 and self.args[0] in options and
flag[1] in self.args):
self.args.remove(flag[1])
queue.remove(queue.packages())
elif (len(self.args) > 2 and self.args[0] in options and

2
slpkg/sbo/network.py
View file

@ -312,7 +312,7 @@ class SBoNetwork(object):
"""Using dialog and checklist option
"""
data = []
if self.name == "ALL":
if not self.name:
data = self.data
else:
for name in self.data: