From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SIsVn-0006wl-1J for garchives@archives.gentoo.org; Sat, 14 Apr 2012 02:14:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93D2BE0CE5; Sat, 14 Apr 2012 02:14:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 66EB8E0CE5 for ; Sat, 14 Apr 2012 02:14:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B197D1B4033 for ; Sat, 14 Apr 2012 02:14:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4C8A9E5402 for ; Sat, 14 Apr 2012 02:14:40 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1334369622.9ec59c4d881960ce0e1f7c2fdc55bad471a8d7b7.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: 9ec59c4d881960ce0e1f7c2fdc55bad471a8d7b7 X-VCS-Branch: master Date: Sat, 14 Apr 2012 02:14:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a4dc4598-838b-48ed-bc89-b31c56abb3ec X-Archives-Hash: 3c51ab3a03de94d99a2fb1a729271a97 commit: 9ec59c4d881960ce0e1f7c2fdc55bad471a8d7b7 Author: Brian Dolbec gentoo org> AuthorDate: Sat Apr 14 02:13:42 2012 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat Apr 14 02:13:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/layman.git;a=3D= commit;h=3D9ec59c4d fix the BareConfig not str sub'ing %(configdir)s before calling read_conf= ig(). indent fix in read_config(). --- layman/config.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/layman/config.py b/layman/config.py index 0541d92..8430221 100644 --- a/layman/config.py +++ b/layman/config.py @@ -151,13 +151,18 @@ class BareConfig(object): self._set_quietness(quietness) self.config =3D None if read_configfile: - self.read_config(self.get_defaults()) + defaults =3D self.get_defaults() + if "%(configdir)s" in defaults['config']: + # fix the config path + defaults['config'] =3D defaults['config'] \ + % {'configdir': defaults['configdir']} + self.read_config(defaults) =20 =20 def read_config(self, defaults): - self.config =3D ConfigParser.ConfigParser(defaults) - self.config.add_section('MAIN') - read_layman_config(self.config, defaults) + self.config =3D ConfigParser.ConfigParser(defaults) + self.config.add_section('MAIN') + read_layman_config(self.config, defaults) =20 =20 def keys(self):