diff --git a/ChangeLog.txt b/ChangeLog.txt index 670be289..7499daf6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +2.7.7 - 30/08/2015 +Added: +- NEW configuration file for repositories in /etc/slpkg/repositories.conf +Update: +- Command line help logo +- Flags for packages upgrade + 2.7.6 - 28/08/2015 Fixed: - Failed checksum message #40 diff --git a/README.rst b/README.rst index 01d64c7d..2e09e682 100644 --- a/README.rst +++ b/README.rst @@ -20,7 +20,7 @@ :target: https://github.com/dslackw/slpkg/issues -Slpkg v2.7.6 +Slpkg v2.7.7 ============ | @@ -131,8 +131,8 @@ Default available Repositories: Versions: {14.0, 14,1} -* Choose default repositories you need to work from file '/etc/slpkg/slpkg.conf' default is - 'slack' and 'sbo' repositories and read REPOSITORIES file for each of the particularities. +* Choose default repositories you need to work from file '/etc/slpkg/repositories.conf' default + is 'slack' and 'sbo' repositories and read REPOSITORIES file for each of the particularities. If a repository is not in the above list, manage custom repositories with commands 'repo-add' and 'repo-remove'. @@ -142,7 +142,7 @@ Usage Need to run '$ slpkg update' for the first time to synchronize the list of packages, also every time you add a new repository. -To add or remove repositories must edit the file '/etc/slpkg/slpkg.conf'. +To add or remove repositories must edit the file '/etc/slpkg/repositories.conf'. Add custom repositories with the command '$ slpkg add-repo ' and after run '$ slpkg update' to update package list. @@ -235,8 +235,8 @@ Untar the archive and run install.sh script: .. code-block:: bash - $ tar xvf slpkg-2.7.6.tar.gz - $ cd slpkg-2.7.6 + $ tar xvf slpkg-2.7.7.tar.gz + $ cd slpkg-2.7.7 $ ./install.sh Using pip: @@ -255,9 +255,9 @@ Using pip: Bbinary packages: -Slackware: `slpkg-2.7.6-i486-1_dsw.txz `_ +Slackware: `slpkg-2.7.7-i486-1_dsw.txz `_ -Slackware64: `slpkg-2.7.6-x86_64-1_dsw.txz `_ +Slackware64: `slpkg-2.7.7-x86_64-1_dsw.txz `_ Optional dependencies @@ -322,6 +322,9 @@ Configuration Files /etc/slpkg/slpkg.conf General configuration of slpkg + + /etc/slpkg/repositories.conf + Configuration file for repositories /etc/slpkg/blacklist List of packages to skip @@ -547,8 +550,11 @@ View information about the repositories: slonly https://slackonly.com/pub/packages/ yes disabled studio http://studioware.org/files/packages/ yes disabled - 15/15 enabled default repositories and 1 custom. - For enable or disable default repositories edit '/etc/slpkg/slpkg.conf' file. + Repositories summary + =============================================================================== + 3/15 enabled default repositories and 1 custom. + For enable or disable default repositories edit '/etc/slpkg/repositories.conf' + file. $ slpkg repo-info alien diff --git a/conf/repositories.conf b/conf/repositories.conf index d678142b..980c2df6 100644 --- a/conf/repositories.conf +++ b/conf/repositories.conf @@ -28,6 +28,7 @@ # Slacke (Enlightenment E17 and E18) repository. Default slacke{18}. # MSB (mate) repository. Default msb{1.10} # Slackware ARM users will must use only two repositories at the moment slack and sbo. +# Default repositories is slack (Slackware) and sbo (SlackBuilds.org) # Read the REPOSITORIES file. # # Uncomment (remove the '#' character) to choose repositories: diff --git a/conf/slpkg.conf b/conf/slpkg.conf index 899c1724..aba64fe2 100644 --- a/conf/slpkg.conf +++ b/conf/slpkg.conf @@ -25,18 +25,6 @@ #--------------------------------------------------------------------------- # Slackware release "stable" or "current". RELEASE=stable -# -# Choose repositories want to work. Read first REPOSITORIES file. -# Available repositories : slack,sbo,alien,rlw,slacky,studio,slackr,slonly, -# ktown{latest},multi,slacke{18},salix,slackl,rested -# msb{1.10} -# -# slackr (slackers.it) repository must used from Slackware64 current. -# Ktown (Alien"s ktown) repository. Default ktown{latest}. -# Slacke (Enlightenment E17 and E18) repository. Default slacke{18}. -# MSB (mate) repository. Default msb{1.10} -# Slackware ARM users will must use only two repositories at the moment slack and sbo. -REPOSITORIES=slack,sbo # Build directory for repository "sbo" slackbuilds.org. In this # directory downloaded sources and scripts for building. diff --git a/man/slpkg.8 b/man/slpkg.8 index de94afa0..9d2dcbf1 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -311,7 +311,7 @@ For example: MATE Desktop Environment = "msb{1.10}" Default enable repository is "slack" and "sbo". - Add or remove default repository in configuration file "/etc/slpkg/slpkg.conf". + Add or remove default repository in configuration file "/etc/slpkg/repositories.conf". Read REPOSITORIES file for particularities. .SH COLORS @@ -335,6 +335,9 @@ For example: /etc/slpkg/slpkg.conf General configuration of slpkg +/etc/slpkg/repositories.conf + Configuration file for repositories + /etc/slpkg/blacklist List of packages to skip diff --git a/slackbuild/doinst.sh b/slackbuild/doinst.sh index a3316326..52802654 100644 --- a/slackbuild/doinst.sh +++ b/slackbuild/doinst.sh @@ -8,7 +8,7 @@ config() { fi } -CONFIGS="slpkg.conf blacklist slackware-mirrors custom-repositories \ +CONFIGS="slpkg.conf repositories.conf blacklist slackware-mirrors custom-repositories \ slackware-changelogs-mirror" for file in $CONFIGS; do config etc/slpkg/${file}.new diff --git a/slackbuild/slpkg.SlackBuild b/slackbuild/slpkg.SlackBuild index 86bbb4a3..c52870e5 100755 --- a/slackbuild/slpkg.SlackBuild +++ b/slackbuild/slpkg.SlackBuild @@ -86,7 +86,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/etc/slpkg # install configurations files -CONFIGS="slpkg.conf blacklist slackware-mirrors custom-repositories \ +CONFIGS="slpkg.conf repositories.conf blacklist slackware-mirrors custom-repositories \ slackware-changelogs-mirror" for file in $CONFIGS; do install -D -m0644 conf/$file $PKG/etc/slpkg/${file}.new diff --git a/slpkg/__metadata__.py b/slpkg/__metadata__.py index 1adabe8f..e882d12f 100644 --- a/slpkg/__metadata__.py +++ b/slpkg/__metadata__.py @@ -87,7 +87,7 @@ class MetaData(object): __all__ = "slpkg" __author__ = "dslackw" - __version_info__ = (2, 7, 6) + __version_info__ = (2, 7, 7) __version__ = "{0}.{1}.{2}".format(*__version_info__) __license__ = "GNU General Public License v3 (GPLv3)" __email__ = "d.zlatanidis@gmail.com" @@ -137,21 +137,21 @@ class MetaData(object): "salix", "slackl", "rested", "msb"] # read value from configuration file - if os.path.isfile("%s%s" % (conf_path, "slpkg.conf")): - f = open("%s%s" % (conf_path, "slpkg.conf"), "r") - conf = f.read() - f.close() - for line in conf.splitlines(): - line = line.lstrip() - if line and not line.startswith("#"): - _conf_slpkg[line.split("=")[0]] = line.split("=")[1] - + repositories = [] + for files in ["slpkg.conf", "repositories.conf"]: + if os.path.isfile("%s%s" % (conf_path, files)): + f = open("%s%s" % (conf_path, files), "r") + conf = f.read() + f.close() + for line in conf.splitlines(): + line = line.lstrip() + if line and not line.startswith("#"): + if files == "slpkg.conf": + _conf_slpkg[line.split("=")[0]] = line.split("=")[1] + elif files == "repositories.conf": + repositories.append(line) # Set values from configuration file slack_rel = _conf_slpkg["RELEASE"] - if isinstance(_conf_slpkg["REPOSITORIES"], basestring): - repositories = _conf_slpkg["REPOSITORIES"].split(",") - else: - repositories = _conf_slpkg["REPOSITORIES"] build_path = _conf_slpkg["BUILD_PATH"] slpkg_tmp_packages = _conf_slpkg["PACKAGES"] slpkg_tmp_patches = _conf_slpkg["PATCHES"] diff --git a/slpkg/repolist.py b/slpkg/repolist.py index 4c96c917..14d55348 100644 --- a/slpkg/repolist.py +++ b/slpkg/repolist.py @@ -89,6 +89,6 @@ class RepoList(object): print("{0}{1}/{2} enabled default repositories and {3} custom.".format( self.meta.color["GREY"], def_cnt, len(self.all_repos), cus_cnt)) print("For enable or disable default repositories edit " - "'/etc/slpkg/slpkg.conf' file.\n{0}".format( + "'/etc/slpkg/repositories.conf'\nfile.\n{0}".format( self.meta.color["ENDC"])) raise SystemExit()