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 <gentoo-commits+bounces-321678-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Puq2b-00033u-WA for garchives@archives.gentoo.org; Wed, 02 Mar 2011 17:40:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B25261C04C; Wed, 2 Mar 2011 17:40:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7D5461C04C for <gentoo-commits@lists.gentoo.org>; Wed, 2 Mar 2011 17:40:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0082F1B4009 for <gentoo-commits@lists.gentoo.org>; Wed, 2 Mar 2011 17:40:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 664CF8006A for <gentoo-commits@lists.gentoo.org>; Wed, 2 Mar 2011 17:40:41 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <3ad5122a80f741119b48cb7f0f5107e64e2e3b11.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/__init__.py X-VCS-Directories: pym/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3ad5122a80f741119b48cb7f0f5107e64e2e3b11 Date: Wed, 2 Mar 2011 17:40:41 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 925d53e7c3b853ab3cf3a4ba098e4ef1 commit: 3ad5122a80f741119b48cb7f0f5107e64e2e3b11 Author: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org> AuthorDate: Wed Mar 2 17:39:56 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Mar 2 17:39:56 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3ad5122a grabdict: allow inline comments --- pym/portage/util/__init__.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index d180f6b..0eaaeb2 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -349,6 +349,13 @@ def grabdict(myfilename, juststrings=3D0, empty=3D0,= recursive=3D0, incremental=3D1): if x[0] =3D=3D "#": continue myline=3Dx.split() + mylinetemp =3D [] + for item in myline: + if not item.startswith('#'): + mylinetemp.append(item) + else: + break + myline =3D mylinetemp if len(myline) < 2 and empty =3D=3D 0: continue if len(myline) < 1 and empty =3D=3D 1: