From 6e60eabfa8a35e352d849bcbfa94859b1edeb0c5 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Wed, 7 Jan 2015 09:27:05 +0200 Subject: [PATCH] update --- CHANGELOG | 1 + README.rst | 10 ++++++++-- man/slpkg.8 | 7 ++++--- slpkg/arguments.py | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a619f2d0..09476777 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ Version 2.1.6 [Feature] - Added custom binary repository. - Added Slackware 'patches' repository in PACKAGES.txt file. - Added Alien's restricted repository. + - Added wget option. Version 2.1.5 27-12-2014 diff --git a/README.rst b/README.rst index d56d8d49..0abd8367 100644 --- a/README.rst +++ b/README.rst @@ -177,6 +177,8 @@ Configuration files /etc/slpkg/slackware-mirrors List of Slackware Mirrors + /etc/slpkg/custom-repositories + List of custom repositories Slackware Current ----------------- @@ -215,11 +217,14 @@ To add or remove repositories must edit the file '/etc/slpkg/slpkg.conf'. Also it is good to update the list of packages by running the command '# slpkg update' before proceeding to any installation or upgrade a new package. +Some repositories lack the file 'ChangeLog.txt' should run the command 'slpkg re-create' +instead of 'slpkg update' to update the package lists when you premiums prove necessary to update. + Issues ------ -Please report any bugs in "https://github.com/dslackw/slpkg/issues" +Please report any bugs in `ISSUES `_ Command Line Tool Usage @@ -241,7 +246,7 @@ Command Line Tool Usage Optional arguments: -h, --help show this help message and exit -v, --version print version and exit - -a, script.tar.gz [source...] auto build SBo packages + -a, [script.tar.gz] [source...] auto build SBo packages -b, --list, [package...] --add, --remove add, remove packages in blacklist -q, --list, [package...] --add, --remove add, remove SBo packages in queue -q, --build, --install, --build-install build, install packages from queue @@ -326,6 +331,7 @@ Take information repositories: $ slpkg repo-info alien + Default: yes Last updated: Tue Dec 23 11:48:31 UTC 2014 Number of packages: 3149 Repo id: alien diff --git a/man/slpkg.8 b/man/slpkg.8 index 79460b78..fcf87e86 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -21,7 +21,7 @@ Usage: slpkg Commands: [repo-info [repository]] [update [slpkg]] Optional arguments: - [-h] [-v] [-a script.tar.gz [sources...]] + [-h] [-v] [-a [script.tar.gz] [sources...]] [-b --list, [...] --add, --remove] [-q --list, [...] --add, --remove] [-q --build, --install, --build-install] @@ -53,7 +53,7 @@ Commands: Optional arguments: -h, --help show this help message and exit -v, --version print version and exit - -a, script.tar.gz [source...] auto build SBo packages + -a, [script.tar.gz] [source...] auto build SBo packages -b, --list, [package...] --add, --remove add, remove packages in blacklist -q, --list, [package...] --add, --remove add, remove SBo packages in queue -q, --build, --install, --build-install build, install packages from queue @@ -71,7 +71,7 @@ Optional arguments: -r, [package...] remove binary packages -d, [package...] display the contents -.SH REPOSITORIES +.SH DEFAULT REPOSITORIES slackware.com = 'slack' SlackBuilds.org = 'sbo' Alien's = 'alien' @@ -85,6 +85,7 @@ Optional arguments: Slacke E17 and E18 = 'slacke{18}' SalixOS = 'salix' Slackel.gr = 'slackel' + Alien's restricted = 'rested' Default enable repository is 'slack' and 'sbo'. Add or remove default repository in configuration file '/etc/slpkg/slpkg.conf'. diff --git a/slpkg/arguments.py b/slpkg/arguments.py index 4fa0897e..8894438f 100644 --- a/slpkg/arguments.py +++ b/slpkg/arguments.py @@ -48,7 +48,7 @@ def options(): " -h, --help show this help message " "and exit", " -v, --version print version and exit", - " -a, script.tar.gz [source...] auto build SBo packages", + " -a, [script.tar.gz] [source...] auto build SBo packages", " -b, --list, [package...] --add, --remove add, remove packages in " "blacklist", " -q, --list, [package...] --add, --remove add, remove SBo packages " @@ -96,7 +96,7 @@ def usage(repo): " [repo-remove [repository]] [repo-list]", " [repo-info [repository]] [update [slpkg]]\n", " Optional arguments:", - " [-h] [-v] [-a script.tar.gz [sources...]]", + " [-h] [-v] [-a [script.tar.gz] [sources...]]", " [-b --list, [...] --add, --remove]", " [-q --list, [...] --add, --remove]", " [-q --build, --install, --build-install]",