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 1RiCOZ-0002PF-7M for garchives@archives.gentoo.org; Tue, 03 Jan 2012 21:59:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B21FC21C06D; Tue, 3 Jan 2012 21:59:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8556D21C06D for ; Tue, 3 Jan 2012 21:59:36 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B1E81B4010 for ; Tue, 3 Jan 2012 21:59:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 282DD80042 for ; Tue, 3 Jan 2012 21:59:35 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: 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: f132600314270f5fbbd168d941566d0fd877eb18 Date: Tue, 3 Jan 2012 21:59:35 +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: ee7a2ef1-2584-4cec-8129-93db672028b6 X-Archives-Hash: dba057c0170cea9d9ae92901fc19cef6 commit: f132600314270f5fbbd168d941566d0fd877eb18 Author: Zac Medico gentoo org> AuthorDate: Tue Jan 3 21:59:25 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jan 3 21:59:25 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df1326003 getlibpaths: regex for include --- pym/portage/util/__init__.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index db8eb94..58501dc 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -1596,11 +1596,15 @@ def find_updated_config_files(target_root, config= _protect): else: yield (x, None) =20 +_ld_so_include_re =3D re.compile(r'^include\s+(\S.*)') + def getlibpaths(root, env=3DNone): def read_ld_so_conf(path): for l in grabfile(path): - if l.startswith('include '): - subpath =3D os.path.join(os.path.dirname(path), l[8:].strip()) + include_match =3D _ld_so_include_re.match(l) + if include_match is not None: + subpath =3D os.path.join(os.path.dirname(path), + include_match.group(1)) for p in glob.glob(subpath): for r in read_ld_so_conf(p): yield r