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 1QgknC-0002OO-B5 for garchives@archives.gentoo.org; Tue, 12 Jul 2011 21:46:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3304F21C0E3; Tue, 12 Jul 2011 21:45:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 04B8A21C0E4 for ; Tue, 12 Jul 2011 21:45:25 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70B202AC028 for ; Tue, 12 Jul 2011 21:45:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A6A2980051 for ; Tue, 12 Jul 2011 21:45:24 +0000 (UTC) From: "Paul Varner" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paul Varner" Message-ID: Subject: [gentoo-commits] proj/gentoolkit:gentoolkit commit in: pym/gentoolkit/revdep_rebuild/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/revdep_rebuild/revdep-rebuild.py X-VCS-Directories: pym/gentoolkit/revdep_rebuild/ X-VCS-Committer: fuzzyray X-VCS-Committer-Name: Paul Varner X-VCS-Revision: a928c7509defc63c913ab61ef138cc59d44c38b6 Date: Tue, 12 Jul 2011 21:45:24 +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: X-Archives-Hash: 257735fb16cd14498b2980970b3da66e commit: a928c7509defc63c913ab61ef138cc59d44c38b6 Author: lis.slawek 5234894e-44cd-11de-9a4c-a76526a19= 3c6> AuthorDate: Thu Nov 18 11:16:57 2010 +0000 Commit: Paul Varner gentoo org> CommitDate: Tue Jul 12 21:29:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoolkit.gi= t;a=3Dcommit;h=3Da928c750 Fixed scanning revdep config; minor fix in analyse function git-svn-id: http://genscripts.googlecode.com/svn/trunk/gentoolkit@485 523= 4894e-44cd-11de-9a4c-a76526a193c6 --- pym/gentoolkit/revdep_rebuild/revdep-rebuild.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pym/gentoolkit/revdep_rebuild/revdep-rebuild.py b/pym/gentoo= lkit/revdep_rebuild/revdep-rebuild.py index 0bc006e..f8f67d6 100755 --- a/pym/gentoolkit/revdep_rebuild/revdep-rebuild.py +++ b/pym/gentoolkit/revdep_rebuild/revdep-rebuild.py @@ -210,9 +210,9 @@ def parse_revdep_config(): continue m =3D re.match('SEARCH_DIRS=3D\\"([^"]+)\\"', line) if m is not None: - s =3D m.group(1).split(' ') + s =3D m.group(1).split() for ss in s: - search_dirs =3D masked_dirs.union(glob.glob(ss)) + search_dirs =3D search_dirs.union(glob.glob(ss)) continue =20 return (masked_dirs, masked_files, search_dirs) @@ -615,7 +615,7 @@ def analyse(output=3Dprint_v, libraries=3DNone, la_li= braries=3DNone, libraries_links=3DN elif _bits.startswith('64'): bits =3D 64 =20 - for av_bits in glob.glob('/lib[0-9]*'): + for av_bits in glob.glob('/lib[0-9]*') or ('/lib32',): bits =3D int(av_bits[4:]) _libraries =3D call_program(['scanelf', '-M', str(bits), '-BF', = '%F',] + libraries+libraries_links).strip().split('\n') =20 @@ -740,6 +740,11 @@ if __name__ =3D=3D "__main__": args +=3D ' --verbose' elif VERBOSITY < 1: args +=3D ' --quiet' + + if len(emerge_command) =3D=3D 0: + print_v(1, bold('\nThere is nothing to emerge. Exiting.')) + sys.exit(0) + emerge_command =3D args + ' --oneshot ' + emerge_command =20 =20