diff --git a/CHANGELOG b/CHANGELOG index 2a3fbe81..25d4121a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,11 +1,17 @@ +Version 2.1.3 +06-12-2014 + +[Updated] - Fix 'IndexError: tuple index out of range' when sbo upgrade. + + Version 2.1.2 -xx-12-2014 +04-12-2014 [Feature] - Added checksum all repositories. [Updated] - Fix downloads modules. -Version 2.1.1-dev +Version 2.1.1 01-12-2014 [Feature] - Added options in /etc/slpkg/slpkg.conf file to select diff --git a/PKG-INFO b/PKG-INFO index 803baba6..26e0cb92 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: slpkg -Version: 2.1.2 +Version: 2.1.3 Author: dslackw Author-email: d zlatanidis at gmail com Maintainer: dslackw diff --git a/README.rst b/README.rst index b4977486..076effc7 100644 --- a/README.rst +++ b/README.rst @@ -11,9 +11,9 @@ Latest Release: -- Version: 2.1.2 +- Version: 2.1.3 - `Package `_ -- `Source `_ +- `Source `_ - `CHANGELOG `_ .. image:: https://raw.githubusercontent.com/dslackw/images/master/slpkg/logo.png @@ -118,8 +118,8 @@ Untar the archive and run install.sh script: .. code-block:: bash - $ tar xvf slpkg-2.1.2.tar.gz - $ cd slpkg-2.1.2 + $ tar xvf slpkg-2.1.3.tar.gz + $ cd slpkg-2.1.3 $ ./install.sh From SourceForge: diff --git a/install.sh b/install.sh index f0a2b0ce..e38b1cf2 100755 --- a/install.sh +++ b/install.sh @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=slpkg -VERSION=${VERSION:-2.1.2} +VERSION=${VERSION:-2.1.3} TAG=${TAG:-_dsw} # Installation script. diff --git a/slackbuild/slpkg.SlackBuild b/slackbuild/slpkg.SlackBuild index be3458f1..294fc523 100755 --- a/slackbuild/slpkg.SlackBuild +++ b/slackbuild/slpkg.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=slpkg -VERSION=${VERSION:-2.1.2} +VERSION=${VERSION:-2.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_dsw} diff --git a/slpkg/__metadata__.py b/slpkg/__metadata__.py index 2e9524fa..49d7450a 100644 --- a/slpkg/__metadata__.py +++ b/slpkg/__metadata__.py @@ -26,7 +26,7 @@ import os __all__ = "slpkg" __author__ = "dslackw" -__version_info__ = (2, 1, 2) +__version_info__ = (2, 1, 3) __version__ = "{0}.{1}.{2}".format(*__version_info__) __license__ = "GNU General Public License v3 (GPLv3)" __email__ = "d.zlatanidis@gmail.com" diff --git a/slpkg/init.py b/slpkg/init.py index 46d7c407..5fe6b5f9 100644 --- a/slpkg/init.py +++ b/slpkg/init.py @@ -96,16 +96,19 @@ class Initialization(object): log = log_path + "sbo/" lib = lib_path + "sbo_repo/" lib_file = "SLACKBUILDS.TXT" + md5_file = "" log_file = "ChangeLog.txt" if not os.path.exists(log): os.mkdir(log) if not os.path.exists(lib): os.mkdir(lib) packages_txt = "{0}{1}/{2}".format(repo, slack_ver(), lib_file) + checksums_md5 = "" changelog_txt = "{0}/{1}/{2}".format(repo, slack_ver(), log_file) self.write(lib, lib_file, packages_txt) self.write(log, log_file, changelog_txt) - self.remote(log, log_file, changelog_txt, lib, lib_file, packages_txt) + self.remote(log, log_file, changelog_txt, lib, lib_file, packages_txt, + md5_file, checksums_md5) def rlw(self): ''' @@ -253,13 +256,14 @@ class Initialization(object): for fu in args[5].split(): PACKAGES_TXT += URL(fu).reading() CHANGELOG_TXT = URL(args[2]).reading() - CHECKSUMS_md5 = URL(args[7]).reading() + if args[6]: + CHECKSUMS_md5 = URL(args[7]).reading() + with open("{0}{1}".format(args[3], args[6]), "w") as f: + f.write(CHECKSUMS_md5) + f.close() with open("{0}{1}".format(args[3], args[4]), "w") as f: f.write(PACKAGES_TXT) f.close() - with open("{0}{1}".format(args[3], args[6]), "w") as f: - f.write(CHECKSUMS_md5) - f.close() with open("{0}{1}".format(args[0], args[1]), "w") as f: f.write(CHANGELOG_TXT) f.close()