From d8aba0957f6ea4fe07444566459d2c80705711ed Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 12 Oct 2009 16:41:36 +0200 Subject: Old layman path in new documentation (#271457) http://bugs.gentoo.org/show_bug.cgi?id=271457 --- ChangeLog | 3 +++ doc/layman.8.xml | 10 +++++----- etc/layman.cfg | 2 +- layman/config.py | 2 +- layman/db.py | 18 +++++++++--------- layman/tests/testfiles/make.conf | 12 ++++++------ 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index c57e164..b8a476a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-10-12 Gunnar Wrobel + * doc/layman.8.xml: Old layman path in new documentation (#271457) + http://bugs.gentoo.org/show_bug.cgi?id=271457 + * layman/db.py (DB.add): app-portage/layman:output grammar error (#259188) http://bugs.gentoo.org/show_bug.cgi?id=259188 diff --git a/doc/layman.8.xml b/doc/layman.8.xml index c62c905..95fee44 100644 --- a/doc/layman.8.xml +++ b/doc/layman.8.xml @@ -558,7 +558,7 @@ Directory that will be used to store the overlays and all additional data layman needs. The default is - /usr/portage/local/layman. layman + /usr/local/portage/layman. layman uses a location within the /usr/portage hierarchy instead of /var in order to store its data. This decision has been made to support @@ -607,7 +607,7 @@ end of /etc/make.conf. This is the reason why layman suggests running "echo "source - /usr/portage/local/layman/make.conf" >> + /usr/local/portage/layman/make.conf" >> /etc/make.conf" after it has been installed. @@ -706,7 +706,7 @@ layman stores a local copy of the fetched remote list. It will be stored in - /usr/portage/local/layman/cache.xml + /usr/local/portage/layman/cache.xml by default. There exists only one such cache file and it will be overwritten every time you run layman. @@ -741,9 +741,9 @@ /etc/make.conf file: - source /usr/portage/local/layman/make.conf + source /usr/local/portage/layman/make.conf - /usr/portage/local/layman/make.conf + /usr/local/portage/layman/make.conf is the default provided in the layman configuration. Change this file name in case you decide to store it somewhere else. diff --git a/etc/layman.cfg b/etc/layman.cfg index 22ab179..2759f84 100644 --- a/etc/layman.cfg +++ b/etc/layman.cfg @@ -29,7 +29,7 @@ make_conf : %(storage)s/make.conf #overlays : http://www.gentoo.org/proj/en/overlays/layman-global.txt # http://dev.gentoo.org/~wrobel/layman/global-overlays.xml # http://mydomain.org/my-layman-list.xml -# file:///usr/portage/local/layman/my-list.xml +# file:///usr/local/portage/layman/my-list.xml overlays : http://www.gentoo.org/proj/en/overlays/layman-global.txt diff --git a/layman/config.py b/layman/config.py index 1e6c8a8..63b1c15 100644 --- a/layman/config.py +++ b/layman/config.py @@ -56,7 +56,7 @@ class Config(object): ''' self.defaults = {'config' : '/etc/layman/layman.cfg', - 'storage' : '/usr/portage/local/layman', + 'storage' : '/usr/local/portage/layman', 'cache' : '%(storage)s/cache', 'local_list': '%(storage)s/overlays.xml', 'make_conf' : '%(storage)s/make.conf', diff --git a/layman/db.py b/layman/db.py index b1c6922..61c0944 100644 --- a/layman/db.py +++ b/layman/db.py @@ -342,7 +342,7 @@ class MakeConf: ... here + '/tests/testfiles/global-overlays.xml', ... 'make_conf' : here + '/tests/testfiles/make.conf', ... 'nocheck' : True, - ... 'storage' : '/usr/portage/local/layman', + ... 'storage' : '/usr/local/portage/layman', ... 'quietness':3} >>> b = DB(config) >>> a = MakeConf(config, b.overlays) @@ -390,7 +390,7 @@ class MakeConf: ... here + '/tests/testfiles/global-overlays.xml', ... 'make_conf' : here + '/tests/testfiles/make.conf', ... 'nocheck' : True, - ... 'storage' : '/usr/portage/local/layman', + ... 'storage' : '/usr/local/portage/layman', ... 'quietness':3} >>> c = DB(config) >>> a = MakeConf(config, c.overlays) @@ -401,7 +401,7 @@ class MakeConf: >>> [i.name for i in b.overlays] [u'wrobel', u'wrobel-stable'] >>> b.extra - [u'/usr/portage/local/ebuilds/testing', u'/usr/portage/local/ebuilds/stable', u'/usr/portage/local/kolab2', u'/usr/portage/local/gentoo-webapps-overlay/experimental', u'/usr/portage/local/gentoo-webapps-overlay/production-ready'] + [u'/usr/local/portage/ebuilds/testing', u'/usr/local/portage/ebuilds/stable', u'/usr/local/portage/kolab2', u'/usr/local/portage/gentoo-webapps-overlay/experimental', u'/usr/local/portage/gentoo-webapps-overlay/production-ready'] >>> os.unlink(write) ''' @@ -418,7 +418,7 @@ class MakeConf: ... here + '/tests/testfiles/global-overlays.xml', ... 'make_conf' : here + '/tests/testfiles/make.conf', ... 'nocheck' : True, - ... 'storage' : '/usr/portage/local/layman', + ... 'storage' : '/usr/local/portage/layman', ... 'quietness':3} >>> c = DB(config) >>> a = MakeConf(config, c.overlays) @@ -429,7 +429,7 @@ class MakeConf: >>> [i.name for i in b.overlays] [] >>> b.extra - [u'/usr/portage/local/ebuilds/testing', u'/usr/portage/local/ebuilds/stable', u'/usr/portage/local/kolab2', u'/usr/portage/local/gentoo-webapps-overlay/experimental', u'/usr/portage/local/gentoo-webapps-overlay/production-ready'] + [u'/usr/local/portage/ebuilds/testing', u'/usr/local/portage/ebuilds/stable', u'/usr/local/portage/kolab2', u'/usr/local/portage/gentoo-webapps-overlay/experimental', u'/usr/local/portage/gentoo-webapps-overlay/production-ready'] >>> os.unlink(write) ''' @@ -447,14 +447,14 @@ class MakeConf: ... here + '/tests/testfiles/global-overlays.xml', ... 'make_conf' : here + '/tests/testfiles/make.conf', ... 'nocheck' : True, - ... 'storage' : '/usr/portage/local/layman', + ... 'storage' : '/usr/local/portage/layman', ... 'quietness':3} >>> c = DB(config) >>> a = MakeConf(config, c.overlays) >>> [i.name for i in a.overlays] [u'wrobel-stable'] >>> a.extra - [u'/usr/portage/local/ebuilds/testing', u'/usr/portage/local/ebuilds/stable', u'/usr/portage/local/kolab2', u'/usr/portage/local/gentoo-webapps-overlay/experimental', u'/usr/portage/local/gentoo-webapps-overlay/production-ready'] + [u'/usr/local/portage/ebuilds/testing', u'/usr/local/portage/ebuilds/stable', u'/usr/local/portage/kolab2', u'/usr/local/portage/gentoo-webapps-overlay/experimental', u'/usr/local/portage/gentoo-webapps-overlay/production-ready'] ''' if os.path.isfile(self.path): self.content() @@ -502,7 +502,7 @@ class MakeConf: ... here + '/tests/testfiles/global-overlays.xml', ... 'make_conf' : here + '/tests/testfiles/make.conf', ... 'nocheck' : True, - ... 'storage' : '/usr/portage/local/layman', + ... 'storage' : '/usr/local/portage/layman', ... 'quietness':3} >>> c = DB(config) >>> a = MakeConf(config, c.overlays) @@ -513,7 +513,7 @@ class MakeConf: >>> [i.name for i in b.overlays] [u'wrobel-stable'] >>> b.extra - [u'/usr/portage/local/ebuilds/testing', u'/usr/portage/local/ebuilds/stable', u'/usr/portage/local/kolab2', u'/usr/portage/local/gentoo-webapps-overlay/experimental', u'/usr/portage/local/gentoo-webapps-overlay/production-ready'] + [u'/usr/local/portage/ebuilds/testing', u'/usr/local/portage/ebuilds/stable', u'/usr/local/portage/kolab2', u'/usr/local/portage/gentoo-webapps-overlay/experimental', u'/usr/local/portage/gentoo-webapps-overlay/production-ready'] >>> os.unlink(write) ''' diff --git a/layman/tests/testfiles/make.conf b/layman/tests/testfiles/make.conf index d32dd16..894e724 100644 --- a/layman/tests/testfiles/make.conf +++ b/layman/tests/testfiles/make.conf @@ -143,13 +143,13 @@ PORT_LOGDIR=/var/log/services/portage.d # concern that they will be deleted by rsync updates. Default is not # defined. PORTDIR_OVERLAY=" -/usr/portage/local/layman/wrobel-stable +/usr/local/portage/layman/wrobel-stable $PORTDIR_OVERLAY -/usr/portage/local/ebuilds/testing -/usr/portage/local/ebuilds/stable -/usr/portage/local/kolab2 -/usr/portage/local/gentoo-webapps-overlay/experimental -/usr/portage/local/gentoo-webapps-overlay/production-ready" +/usr/local/portage/ebuilds/testing +/usr/local/portage/ebuilds/stable +/usr/local/portage/kolab2 +/usr/local/portage/gentoo-webapps-overlay/experimental +/usr/local/portage/gentoo-webapps-overlay/production-ready" # Fetching files # ============== -- cgit v1.2.3-1-g7c22