diff --git a/CHANGELOG b/CHANGELOG index 68738349..9cd94feb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,11 @@ Version 2.2.4-dev 21-2-2015 -[Updated] - Fix Error-prone - +[Updated] - Fix Error-prone. + - Rename variable name 'VERSION' to 'RELEASE' in configuration file. + - Merge functions and fix __metadata__ complexity. + - Update slackbulid and install script. + - Rename command 're-create' to 'upgrade'. Version 2.2.3 16-2-2015 diff --git a/README.rst b/README.rst index 60190a88..4c9176a0 100644 --- a/README.rst +++ b/README.rst @@ -231,7 +231,7 @@ Command Line Tool Usage Commands: update update all package lists - re-create recreate package lists + upgrade upgrade package lists repo-add [repository name] [URL] add custom repository repo-remove [repository] remove custom repository repo-list list all repositories diff --git a/man/slpkg.8 b/man/slpkg.8 index c886d2cb..c4cc3152 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -16,7 +16,7 @@ Slpkg is a user-friendly package manager for Slackware installations .SH SYNOPSIS Usage: slpkg Commands: - [update] [re-create] [repo-add [repository name] [URL]] + [update] [upgrade] [repo-add [repository name] [URL]] [repo-remove [repository]] [repo-list] [repo-info [repository]] [update [slpkg]] @@ -43,7 +43,7 @@ Slpkg is a user-friendly package manager for Slackware installations Commands: update update all package lists - re-create recreate package lists + upgrade upgrade package lists repo-add [repository name] [URL] add custom repository repo-remove [repository] remove custom repository repo-list list all repositories @@ -130,11 +130,11 @@ The following commands are available. Used to re-synchronize the package lists and create some important files. This command must run every new repository is added or new updates is available. -.SS re-create, recreate packages list -\fBslpkg\fP \fBre-create\fP +.SS upgrade, recreate packages list +\fBslpkg\fP \fBupgrade\fP .PP It is sometimes useful to create all of the base file from the beginning so this -command deletes all the packages lists and re-created. +command delete all the package lists and recreated. .SS repo-add, add custom repository \fBslpkg\fP \fBrepo-add\fP <\fIrepository name\fP> <\fIURL\fP> diff --git a/slpkg/arguments.py b/slpkg/arguments.py index 2ed92315..b07b96f3 100644 --- a/slpkg/arguments.py +++ b/slpkg/arguments.py @@ -35,7 +35,7 @@ def options(): "Commands:", " update update all package " "lists", - " re-create recreate package lists", + " upgrade upgrade package lists", " repo-add [repository name] [URL] add custom repository", " repo-remove [repository] remove custom repository", " repo-list list all repositories", @@ -91,7 +91,7 @@ def usage(repo): "\nslpkg - version {0} | set: {1}\n".format(_m.__version__, _m.slack_rel), "Usage: slpkg Commands:", - " [update] [re-create] [repo-add [repository name] [URL]]", + " [update] [upgrade] [repo-add [repository name] [URL]]", " [repo-remove [repository]] [repo-list]", " [repo-info [repository]] [update [slpkg]]\n", " Optional arguments:", @@ -108,7 +108,7 @@ def usage(repo): " [-n] [-f [...]] [-i [...]] [-u [...]]", " [-o [...]] [-r [...]] [-d [...]]\n", error_repo, - "For more information try 'slpkg -h or --help' or view manpage\n" + "For more information try 'slpkg -h, --help' or view manpage\n" ] for usg in view: print(usg) diff --git a/slpkg/init.py b/slpkg/init.py index b78f1e49..29a2b8e7 100644 --- a/slpkg/init.py +++ b/slpkg/init.py @@ -549,7 +549,7 @@ class Initialization(object): FILELIST_TXT = URL(args[9]).reading() self.write_file(args[3], args[8], FILELIST_TXT) - def re_create(self): + def upgrade(self): ''' Remove all package lists with changelog and checksums files and create lists again diff --git a/slpkg/main.py b/slpkg/main.py index 11ed41ef..6de7264f 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -47,8 +47,8 @@ from __metadata__ import MetaData as _m from pkg.build import BuildPackage from pkg.manager import PackageManager -from sbo.check import sbo_upgrade from sbo.views import SBoNetwork +from sbo.check import sbo_upgrade from sbo.slackbuild import SBoInstall from slack.patches import Patches @@ -80,7 +80,7 @@ class ArgParse(object): # checking if repositories exists if len(self.args) > 1 and self.args[0] not in [ - '-h', '--help', '-v', '--version', 're-create', 'repo-list', + '-h', '--help', '-v', '--version', 'upgrade', 'repo-list', 'repo-add', 'repo-remove', 'update', 'update-slpkg', '-g' ]: check_exists_repositories() @@ -129,10 +129,10 @@ class ArgParse(object): else: usage('') - def command_re_create(self): + def command_upgrade(self): """ re create repositories package lists """ - if len(self.args) == 1 and self.args[0] == 're-create': - Initialization().re_create() + if len(self.args) == 1 and self.args[0] == 'upgrade': + Initialization().upgrade() else: usage('') @@ -370,11 +370,11 @@ def main(): '-v': argparse.help_version, '--version': argparse.help_version, 'update': argparse.command_update, + 'upgrade': argparse.command_upgrade, 'update-slpkg': argparse.command_update_slpkg, 'repo-list': argparse.command_repo_list, 'repo-add': argparse.command_repo_add, 'repo-remove': argparse.command_repo_remove, - 're-create': argparse.command_re_create, 'repo-info': argparse.command_repo_info, '-a': argparse.auto_build, '-l': argparse.pkg_list,