From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A7F8D13877A for ; Mon, 16 Jun 2014 03:40:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5A71E0B66; Mon, 16 Jun 2014 03:40:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 178F5E0B4E for ; Mon, 16 Jun 2014 03:40:22 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A09233FD5F for ; Mon, 16 Jun 2014 03:40:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id BAEE2187F6 for ; Mon, 16 Jun 2014 03:40:18 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402607510.f8132d4a8c8bf44ed90bef88c35eb9565e6a4a4d.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/config.py X-VCS-Directories: layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f8132d4a8c8bf44ed90bef88c35eb9565e6a4a4d X-VCS-Branch: master Date: Mon, 16 Jun 2014 03:40:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 99b0e38c-3f4a-478f-a56c-9672709f454f X-Archives-Hash: 5dc0861edb1eb06d1e0eaa3f94a772ac commit: f8132d4a8c8bf44ed90bef88c35eb9565e6a4a4d Author: Devan Franchini gentoo org> AuthorDate: Sun Jun 1 22:23:50 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Jun 12 21:11:50 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=f8132d4a config.py: moves EPREFIX constant to top of file --- layman/config.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/layman/config.py b/layman/config.py index 9d2bc7f..31dc0ac 100644 --- a/layman/config.py +++ b/layman/config.py @@ -27,7 +27,6 @@ from __future__ import unicode_literals __version__ = "0.2" - import sys import os @@ -41,6 +40,13 @@ except: from layman.output import Message from layman.utils import path +# establish the eprefix, initially set so eprefixify can +# set it on install +EPREFIX = "@GENTOO_PORTAGE_EPREFIX@" +# check and set it if it wasn't +if "GENTOO_PORTAGE_EPREFIX" in EPREFIX: + EPREFIX = '' + def read_layman_config(config=None, defaults=None, output=None): """reads the config file defined in defaults['config'] and updates the config @@ -66,14 +72,6 @@ def read_layman_config(config=None, defaults=None, output=None): overlays.update(["file://" + _path]) config.set('MAIN', 'overlays', '\n'.join(overlays)) -# establish the eprefix, initially set so eprefixify can -# set it on install -EPREFIX = "@GENTOO_PORTAGE_EPREFIX@" - -# check and set it if it wasn't -if "GENTOO_PORTAGE_EPREFIX" in EPREFIX: - EPREFIX = '' - class BareConfig(object): '''Handles the configuration only.''' From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8A9AC13877A for ; Mon, 16 Jun 2014 03:37:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E15BAE0BB3; Mon, 16 Jun 2014 03:37:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 494E6E0B98 for ; Mon, 16 Jun 2014 03:37:32 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCAF333FFA7 for ; Mon, 16 Jun 2014 03:37:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 00184187F6 for ; Mon, 16 Jun 2014 03:37:29 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402607510.f8132d4a8c8bf44ed90bef88c35eb9565e6a4a4d.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:gsoc2014 commit in: layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/config.py X-VCS-Directories: layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f8132d4a8c8bf44ed90bef88c35eb9565e6a4a4d X-VCS-Branch: gsoc2014 Date: Mon, 16 Jun 2014 03:37:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d86653b3-5047-4a9d-9596-62f093d30d73 X-Archives-Hash: b1f1d01920f1669d8186a0b456751ee1 Message-ID: <20140616033729.p5-pHygMSSOjTMS6S0JjqaqRGhj2o10jQ1z0x2U5Yik@z> commit: f8132d4a8c8bf44ed90bef88c35eb9565e6a4a4d Author: Devan Franchini gentoo org> AuthorDate: Sun Jun 1 22:23:50 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Jun 12 21:11:50 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=f8132d4a config.py: moves EPREFIX constant to top of file --- layman/config.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/layman/config.py b/layman/config.py index 9d2bc7f..31dc0ac 100644 --- a/layman/config.py +++ b/layman/config.py @@ -27,7 +27,6 @@ from __future__ import unicode_literals __version__ = "0.2" - import sys import os @@ -41,6 +40,13 @@ except: from layman.output import Message from layman.utils import path +# establish the eprefix, initially set so eprefixify can +# set it on install +EPREFIX = "@GENTOO_PORTAGE_EPREFIX@" +# check and set it if it wasn't +if "GENTOO_PORTAGE_EPREFIX" in EPREFIX: + EPREFIX = '' + def read_layman_config(config=None, defaults=None, output=None): """reads the config file defined in defaults['config'] and updates the config @@ -66,14 +72,6 @@ def read_layman_config(config=None, defaults=None, output=None): overlays.update(["file://" + _path]) config.set('MAIN', 'overlays', '\n'.join(overlays)) -# establish the eprefix, initially set so eprefixify can -# set it on install -EPREFIX = "@GENTOO_PORTAGE_EPREFIX@" - -# check and set it if it wasn't -if "GENTOO_PORTAGE_EPREFIX" in EPREFIX: - EPREFIX = '' - class BareConfig(object): '''Handles the configuration only.'''