From 3718a4c52f8d1b09f9e3dedce1a748efbed9b933 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Wed, 12 Sep 2007 04:51:29 +0000 Subject: Fixed bug #192190, update to version 1.1.1. --- ChangeLog | 11 +++++++ ebuild/layman-1.1.1.ebuild | 77 ++++++++++++++++++++++++++++++++++++++++++++++ ebuild/layman-1.1.ebuild | 77 ---------------------------------------------- layman/action.py | 6 ++-- layman/version.py | 2 +- 5 files changed, 92 insertions(+), 81 deletions(-) create mode 100644 ebuild/layman-1.1.1.ebuild delete mode 100644 ebuild/layman-1.1.ebuild diff --git a/ChangeLog b/ChangeLog index e6df33a..3bd26b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-09-12 Gunnar Wrobel + + * layman/version.py: + + Version 1.1.1 + + * layman/action.py (Sync.__init__): + + Fixed --sync-all (#192190) + http://bugs.gentoo.org/show_bug.cgi?id=192190 + 2007-09-11 Gunnar Wrobel * layman/config.py (Config.__init__): diff --git a/ebuild/layman-1.1.1.ebuild b/ebuild/layman-1.1.1.ebuild new file mode 100644 index 0000000..f246993 --- /dev/null +++ b/ebuild/layman-1.1.1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.0.10.ebuild,v 1.1 2007/01/09 18:01:15 wrobel Exp $ + +inherit eutils distutils + +DESCRIPTION="A python script for retrieving gentoo overlays." +HOMEPAGE="http://projects.gunnarwrobel.de/scripts" +SRC_URI="http://build.pardus.de/downloads/${PF}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" +S=${WORKDIR}/${PF} + +DEPEND="" +RDEPEND="" + +pkg_setup() { + if has_version dev-util/subversion && built_with_use dev-util/subversion nowebdav; then + eerror "You must rebuild your subversion without the nowebdav USE flag" + die "You must rebuild your subversion without the nowebdav USE flag" + fi +} + +src_install() { + + distutils_src_install + + dodir /etc/layman + cp etc/* ${D}/etc/layman/ + + doman doc/layman.8 + dohtml doc/layman.8.html + +} + +src_test() { + cd ${S} + einfo "Running layman doctests..." + echo + if ! PYTHONPATH="." ${python} layman/tests/dtest.py; then + eerror "DocTests failed - please submit a bug report" + die "DocTesting failed!" + fi +} + +pkg_postinst() { + einfo "You are now ready to add overlays into your system." + einfo + einfo "layman -L" + einfo + einfo "will display a list of available overlays." + einfo + ewarn "Use the -k switch to also list overlays that are" + ewarn "considered less secure." + einfo + elog "Select an overlay and add it using" + einfo + elog "layman -a overlay-name" + einfo + elog "If this is the very first overlay you add with layman," + elog "you need to append the following statement to your" + elog "/etc/make.conf file:" + elog + elog "source /usr/portage/local/layman/make.conf" + elog + elog "If you modify the 'storage' parameter in the layman" + elog "configuration file (/etc/layman/layman.cfg) you will" + elog "need to adapt the path given above to the new storage" + elog "directory." + einfo + ewarn "Please add the 'source' statement to make.conf only AFTER " + ewarn "you added your first overlay. Otherwise portage will fail." + epause 5 +} diff --git a/ebuild/layman-1.1.ebuild b/ebuild/layman-1.1.ebuild deleted file mode 100644 index f246993..0000000 --- a/ebuild/layman-1.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.0.10.ebuild,v 1.1 2007/01/09 18:01:15 wrobel Exp $ - -inherit eutils distutils - -DESCRIPTION="A python script for retrieving gentoo overlays." -HOMEPAGE="http://projects.gunnarwrobel.de/scripts" -SRC_URI="http://build.pardus.de/downloads/${PF}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="" -S=${WORKDIR}/${PF} - -DEPEND="" -RDEPEND="" - -pkg_setup() { - if has_version dev-util/subversion && built_with_use dev-util/subversion nowebdav; then - eerror "You must rebuild your subversion without the nowebdav USE flag" - die "You must rebuild your subversion without the nowebdav USE flag" - fi -} - -src_install() { - - distutils_src_install - - dodir /etc/layman - cp etc/* ${D}/etc/layman/ - - doman doc/layman.8 - dohtml doc/layman.8.html - -} - -src_test() { - cd ${S} - einfo "Running layman doctests..." - echo - if ! PYTHONPATH="." ${python} layman/tests/dtest.py; then - eerror "DocTests failed - please submit a bug report" - die "DocTesting failed!" - fi -} - -pkg_postinst() { - einfo "You are now ready to add overlays into your system." - einfo - einfo "layman -L" - einfo - einfo "will display a list of available overlays." - einfo - ewarn "Use the -k switch to also list overlays that are" - ewarn "considered less secure." - einfo - elog "Select an overlay and add it using" - einfo - elog "layman -a overlay-name" - einfo - elog "If this is the very first overlay you add with layman," - elog "you need to append the following statement to your" - elog "/etc/make.conf file:" - elog - elog "source /usr/portage/local/layman/make.conf" - elog - elog "If you modify the 'storage' parameter in the layman" - elog "configuration file (/etc/layman/layman.cfg) you will" - elog "need to adapt the path given above to the new storage" - elog "directory." - einfo - ewarn "Please add the 'source' statement to make.conf only AFTER " - ewarn "you added your first overlay. Otherwise portage will fail." - epause 5 -} diff --git a/layman/action.py b/layman/action.py index b8259a5..428c061 100644 --- a/layman/action.py +++ b/layman/action.py @@ -92,12 +92,12 @@ class Sync: self.selection = config['sync'] + if config['sync_all'] or 'ALL' in self.selection: + self.selection = self.db.overlays.keys() + enc = sys.getfilesystemencoding() self.selection = [i.decode(enc) for i in self.selection] - if config['sync_all'] or 'ALL' in self.selection: - self.selection = self.db.overlays.keys() - def run(self): '''Synchronize the overlays.''' diff --git a/layman/version.py b/layman/version.py index c740a18..2465620 100644 --- a/layman/version.py +++ b/layman/version.py @@ -18,7 +18,7 @@ __version__ = "$Id: version.py 309 2007-04-09 16:23:38Z wrobel $" -VERSION = '1.1' +VERSION = '1.1.1' if __name__ == '__main__': print VERSION -- cgit v1.2.3-1-g7c22