diff --git a/CHANGELOG b/CHANGELOG index 3e2b581a..a8c28786 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,7 @@ Version 2.1.4-dev [Updated] - Fix 'UnboundLocalError: local variable 'md5' referenced before assignment' after try update alien repository in some packages and for Slackware current - users. + users. Thanks to 'Jack Kiersey' for reporting. Version 2.1.3-dev 06-12-2014 diff --git a/README.rst b/README.rst index 7b1d1388..b178a3d9 100644 --- a/README.rst +++ b/README.rst @@ -50,8 +50,8 @@ Supported Repositories: Arch: {x86, x86_64} Versions: {13.37, 14.0, 14.1} -* Choose repositories you need to work from file '/etc/slpkg/slpkg.conf' default is all repositories. - +* Choose repositories you need to work from file '/etc/slpkg/slpkg.conf' default is + all repositories. Slpkg works in accordance with the standards of the organization slackbuilds.org to builds packages. Also uses the Slackware linux instructions for installation, @@ -64,18 +64,12 @@ display warning messages, etc. The big advantages is resolving dependencies packages from repositories and monitored for upgraded packages. -Of course you wonder how the slpkg is up to date at all times; -It's simple, every time there is a change in ChangeLog.txt before proceeding to any -execution program looksat whether there is a change in file size and downloads and updates -the PACKAGES.TXT file. - Also you can install official packages of your favorite distribution directly from the official repositories of Slackware. Even you can check for the official updates and install them. And as we say Slackers, Keep it Simple Stupid! - .. image:: https://raw.githubusercontent.com/dslackw/images/master/slpkg/slpkg_package.png :target: https://github.com/dslackw/slpkg @@ -139,9 +133,6 @@ Upgrade In each slpkg upgrade should track the configuration files in the file '/etc/slpkg' for new updates. -*** IMPORTANT : -*** Recommended to replace '/etc/slpkg/slpkg.conf' file with '/etc/slpkg/slpkg.conf.new' file. - Configuration files ------------------- @@ -168,6 +159,15 @@ For Slackware 'current' users must change the variable VERSION in '/etc/slpkg.co $ slpkg -g --config=nano +Testing +------- + +The majority of trials have been made in an environment Slackware x86_64 and x86 stable version +14.1. +Is logical tests are always to be latest versions of the distribution. +Slpkg are supported version 'current' but it is minimal tests have been done on this release. + + Slackware Mirrors ----------------- @@ -181,7 +181,16 @@ Usage Need to run '# slpkg update' for the first time to synchronize the list of packages, also every time you add a repository. -To add repositories must edit the file '/etc/slpkg/slpkg.conf'. +To add or remove repositories must edit the file '/etc/slpkg/slpkg.conf'. + +Also it is good to inform the list of packages by running the command '# slpkg update' +before proceeding to any installation or upgrade a new package. + + +Issues +------ + +Please report any bugs in "https://github.com/dslackw/slpkg/issues" Command Line Tool Usage @@ -206,7 +215,7 @@ Command Line Tool Usage -c, [repository] --upgrade check for updated packages -s, [repository] [package] download, build & install -t, [repository] [package] tracking dependencies - -p, [repository] [package] --color=[] print package description + -p, [repository] [package], --color=[] print package description -f, [package] find installed packages -n, [package] view SBo packages through network -i, [package...] install binary packages diff --git a/man/slpkg.8 b/man/slpkg.8 index ee8c752b..c50f1219 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -24,7 +24,7 @@ Usage: slpkg [-h] [-v] [-a script.tar.gz [sources...]] [-c [repository] --upgrade] [-s [repository] [package][ [-t [repository] [package]] - [-p [repository] [package] --color=] + [-p [repository] [package], --color=[]] [-f] [-n] [-i [...]] [-u [...]] [-o [...]] [-r [...]] [-d [...]] @@ -50,7 +50,7 @@ Optional arguments: -c, [repository] --upgrade check for updated packages -s, [repository] [package] download, build & install -t, [repository] [package] tracking dependencies - -p, [repository] [package] --color=[] print package description + -p, [repository] [package], --color=[] print package description -f, [package] find installed packages -n, [package] view SBo packages through network -i, [package...] install binary packages @@ -76,6 +76,7 @@ The following commands are available. \fBslpkg\fP \fBupdate\fP .PP 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 -a, auto build packages \fBslpkg\fP \fB-a\fP <\fIscript\fP> <\fIsources\fP> diff --git a/slpkg/arguments.py b/slpkg/arguments.py index 3199d4c5..09086dab 100644 --- a/slpkg/arguments.py +++ b/slpkg/arguments.py @@ -53,7 +53,7 @@ def options(): "packages", " -s, [repository] [package] download, build & install", " -t, [repository] [package] tracking dependencies", - " -p, [repository] [package] --color=[] print package description", + " -p, [repository] [package], --color=[] print package description", " -f, [package] find installed packages", " -n, [package] view SBo packages " "through network", @@ -79,7 +79,7 @@ def usage(): " [-c [repository] --upgrade]", " [-s [repository] [package]", " [-t [repository] [package]", - " [-p [repository] [package] --color=[]]", + " [-p [repository] [package], --color=[]]", " [-f] [-n] [-i [...]] [-u [...]]", " [-o [...]] [-r [...]] [-d [...]]\n", "For more information try 'slpkg --help' or view manpage\n" diff --git a/slpkg/init.py b/slpkg/init.py index eb1e5fec..e4a26368 100644 --- a/slpkg/init.py +++ b/slpkg/init.py @@ -243,8 +243,9 @@ class Initialization(object): args[0]=log, args[1]=log_file, arg[2]=changelog_txt args[3]=lib, args[4]=lib_file, arg[5]=packages_txt args[6]=md5_file, args[7]=checksums_md5 - If the two files differ in size delete and replaced with new. - We take the size of ChangeLog.txt from the server and locally + + We take the size of ChangeLog.txt from the server and locally. + If the two files differ in size delete and replace all files with new. ''' PACKAGES_TXT = "" toolbar_width, index = 2, 0 @@ -261,20 +262,23 @@ class Initialization(object): for fu in args[5].split(): PACKAGES_TXT += URL(fu).reading() CHANGELOG_TXT = URL(args[2]).reading() + # create CHECKSUMS.md5 file if args[6]: CHECKSUMS_md5 = URL(args[7]).reading() with open("{0}{1}".format(args[3], args[6]), "w") as f: - for line in CHECKSUMS_md5.splitlines(): - index += 1 - toolbar_width = status(index, toolbar_width, 700) - f.write(line + "\n") - f.close() + for line in CHECKSUMS_md5.splitlines(): + index += 1 + toolbar_width = status(index, toolbar_width, 700) + f.write(line + "\n") + f.close() + # create PACKAGES.txt file with open("{0}{1}".format(args[3], args[4]), "w") as f: for line in PACKAGES_TXT.splitlines(): index += 1 toolbar_width = status(index, toolbar_width, 700) f.write(line + "\n") f.close() + # create ChangeLog.txt file with open("{0}{1}".format(args[0], args[1]), "w") as f: for line in CHANGELOG_TXT.splitlines(): index += 1 @@ -320,5 +324,8 @@ def check_exists_repositories(): "/ChangeLog.txt")): update = True if update: - print("\nPlease update packages lists. Run 'slpkg update'\n") + print("\nPlease update packages lists. Run 'slpkg update'.\n" + + "This command must run it every time a repository is \n" + + "activated or when you want to see if there are new \n" + + "update packages to them.\n") sys.exit(0) diff --git a/slpkg/main.py b/slpkg/main.py index f09c7814..0770530c 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -100,7 +100,6 @@ class Case(object): def main(): - # repositories = ["sbo", "slack", "rlw", "alien", "slacky"] s_user(getpass.getuser()) args = sys.argv args.pop(0) diff --git a/slpkg/messages.py b/slpkg/messages.py index f7e49ca9..af61d180 100644 --- a/slpkg/messages.py +++ b/slpkg/messages.py @@ -82,6 +82,6 @@ def slacky_error(): ''' Slacky repository error ''' - print("\nRepository slack working together with the slack.") + print("\nRepository slack working together with the slacky.") print("Please add the repository slack from file " + "'/etc/slpkg/slpkg.conf'\n") diff --git a/slpkg/others/greps.py b/slpkg/others/greps.py index 40f858d2..775944db 100644 --- a/slpkg/others/greps.py +++ b/slpkg/others/greps.py @@ -22,7 +22,6 @@ # along with this program. If not, see . import os -import sys from slpkg.toolbar import status from slpkg.__metadata__ import lib_path diff --git a/slpkg/others/install.py b/slpkg/others/install.py index 47d79fcd..86f9879a 100644 --- a/slpkg/others/install.py +++ b/slpkg/others/install.py @@ -321,8 +321,6 @@ def write_deps(dependencies): name = dependencies[-1] if find_package(name + "-", pkg_path): dep_path = log_path + "dep/" - if not os.path.exists(log_path): - os.mkdir(log_path) if not os.path.exists(dep_path): os.mkdir(dep_path) if os.path.isfile(dep_path + name): diff --git a/slpkg/sbo/slackbuild.py b/slpkg/sbo/slackbuild.py index ef8ae6af..b096f515 100644 --- a/slpkg/sbo/slackbuild.py +++ b/slpkg/sbo/slackbuild.py @@ -396,8 +396,6 @@ def write_deps(dependencies): name = dependencies[-1] if find_package(name + sp, pkg_path): dep_path = log_path + "dep/" - if not os.path.exists(log_path): - os.mkdir(log_path) if not os.path.exists(dep_path): os.mkdir(dep_path) if os.path.isfile(dep_path + name): diff --git a/slpkg/tracking.py b/slpkg/tracking.py index 8fc9f9ff..aecb62cf 100644 --- a/slpkg/tracking.py +++ b/slpkg/tracking.py @@ -53,8 +53,8 @@ def track_dep(name, repo): ''' if (not os.path.isfile(lib_path + "slack_repo/PACKAGES.TXT") and repo == "slacky"): - slacky_error() - sys.exit(0) + slacky_error() + sys.exit(0) sys.stdout.write("{0}Reading package lists ...{1}".format(color['GREY'], color['ENDC'])) sys.stdout.flush()