update source

This commit is contained in:
Dimitris Zlatanidis 2015-01-28 22:23:16 +02:00
parent 38a1072bdb
commit 0d10354dd1
6 changed files with 23 additions and 20 deletions

View file

@ -1,10 +1,12 @@
Version 2.2.1
27-1-2015
28-1-2015
[Feature] - Added support multipackages.
[Updated] - Fix [key error] when you enter wrong repository as default.
[Updated] - Fix [key error] when you enter wrong name repository as default.
- Rename BUILD variable to BUILD_PATH in configuration file slpkg.conf.
- Change in view list of packages in option '-l'.
- Update option '-f' view installed packages.
Version 2.2.0
08-1-2015

View file

@ -21,10 +21,6 @@ dependencies not included in the repository. This can be checked if you run the
'slpkg -t slackr <package>'. (Example: noticed that the package 'digikam' indicate
dependence 'ffmpeg' but that is not available from the repository itself).
Slackonly (slonly) repository contains no dependencies on file PACKAGES.TXT and this makes
it difficult to automatically resolve dependencies and in the file PACKAGES.TXT and some
lines with 'PACKAGE NAME:' there is no package so 'slpkg' can not find package.
Studioware (studio), Alien's ktown (ktown), Alien's multilib (multi), Slacke E17 and E18
and Alien's restricted repository has no reference dependencies.

View file

@ -26,7 +26,7 @@ Usage: slpkg Commands:
[-q --list, [...] --add, --remove]
[-q --build, --install, --build-install]
[-g --config, --config=[editor]]
[-l all, official, non-official, --index]
[-l [repository], --index]
[-c [repository] --upgrade]
[-s [repository] [package...]
[-t [repository] [package]
@ -46,8 +46,8 @@ Commands:
re-create recreate package lists
repo-add [repository name] [URL] add custom repository
repo-remove [repository] remove custom repository
repolist list all repositories
repoinfo [repository] repository information
repo-list list all repositories
repo-info [repository] repository information
update slpkg check and update slpkg
Optional arguments:
@ -58,10 +58,10 @@ Optional arguments:
-q, --list, [package...] --add, --remove add, remove SBo packages in queue
-q, --build, --install, --build-install build, install packages from queue
-g, --config, --config=<editor> configuration file management
-l, all, official, non-official, --index list of installed packages
-l, [repository], --index list of repositories packages
-c, [repository] --upgrade check for updated packages
-s, [repository] [package...] download, build & install
-t, [repository] [package] tracking dependencies
-s, [repository] [package...] download, build & install packages
-t, [repository] [package] package tracking dependencies
-p, [repository] [package], --color=[] print package description
-n, [package] view SBo packages through network
-f, [package...] find installed packages
@ -171,8 +171,7 @@ Print configuration file or edit with editor.
.SS -l , list of installed packages
\fBslpkg\fP \fB-l\fP <\fIall\fP> \fIofficial\fP \fInon-official\fP \fI--index\fP
.PP
List of installed packages by category official or non-official. The repository 'slack' must
be enabled to work properly 'official' and 'non-official' lists.
List of packages per repository. Support command 'grep' like '# slpkg -l sbo | grep "python"'.
.SS -c , check if your packages is up to date
\fBslpkg\fP \fB-c\fP <\fIrepository\fP> \fI--upgrade\f
@ -180,7 +179,7 @@ be enabled to work properly 'official' and 'non-official' lists.
Check your packages is up to date.
.SS -s , download, build and install package with all dependencies
\fBslpkg\fP \fB-s\fP <\fIrepository\fP> <\fIname of package\fP>
\fBslpkg\fP \fB-s\fP <\fIrepository\fP> <\fIname of packages\fP>
.PP
Installs or upgrade packages from the repositories with automatically resolving all
dependencies of the package. Also installs the official distribution Slackware
@ -202,6 +201,7 @@ Print package description with color. Available colors: red, green, yellow, cyan
\fBslpkg\fP \fB-f\fP <\fIname of packages\fP>
.PP
Find installed packages with view total file size.
Example you can view all installed sbo packages like '# slpkg -f _SBo'.
.SS -n , find packages from SBo repositority
\fBslpkg\fP \fB-n\fP <\fIname of package\fP>

View file

@ -58,8 +58,10 @@ def options():
"packages",
" -c, [repository] --upgrade check for updated "
"packages",
" -s, [repository] [package...] download, build & install",
" -t, [repository] [package] tracking dependencies",
" -s, [repository] [package...] download, build & install "
"packages",
" -t, [repository] [package] package tracking "
"dependencies",
" -p, [repository] [package], --color=[] print package description",
" -n, [package] view SBo packages "
"through network",

View file

@ -289,7 +289,10 @@ class BinaryInstall(object):
for pkg in packages:
for name, loc, comp, uncomp in zip(data[0], data[1], data[2],
data[3]):
if name and pkg == split_package(name)[0] and pkg not in black:
if name:
pkg_ver = '{0}-{1}'.format(split_package(name)[0],
split_package(name)[1])
if pkg in pkg_ver and pkg not in black:
dwn.append("{0}{1}/{2}".format(self.mirror, loc, name))
install.append(name)
comp_sum.append(comp)
@ -298,7 +301,8 @@ class BinaryInstall(object):
for pkg in packages:
for name, loc, comp, uncomp in zip(data[0], data[1], data[2],
data[3]):
if name and pkg in split_package(name)[0]:
if (name and pkg in split_package(name)[0]
and pkg not in black):
dwn.append("{0}{1}/{2}".format(self.mirror, loc, name))
install.append(name)
comp_sum.append(comp)

View file

@ -95,7 +95,6 @@ class SBoInstall(object):
if not self.package_found:
match = True
self.package_found = self.matching(self.package_not_found)
self.master_packages, mas_src = self.sbo_version_source(
self.package_found)
msg_done()