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 1QgkmQ-0002Du-V2 for garchives@archives.gentoo.org; Tue, 12 Jul 2011 21:46:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCE1F21C277; Tue, 12 Jul 2011 21:45:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9AF1F21C277 for ; Tue, 12 Jul 2011 21:45:28 +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 301DD2AC238 for ; Tue, 12 Jul 2011 21:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9937D8003D for ; Tue, 12 Jul 2011 21:45:27 +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/analyse.py pym/gentoolkit/revdep_rebuild/rebuild.py X-VCS-Directories: pym/gentoolkit/revdep_rebuild/ X-VCS-Committer: fuzzyray X-VCS-Committer-Name: Paul Varner X-VCS-Revision: c7d95a92e5ec1b12f15536866bb05a77eae7e466 Date: Tue, 12 Jul 2011 21:45:27 +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: 6b2ab5b99cc41e51dbf489ee26b8ec46 commit: c7d95a92e5ec1b12f15536866bb05a77eae7e466 Author: Slawek gmail com> AuthorDate: Wed Apr 27 04:21:03 2011 +0000 Commit: Paul Varner gentoo org> CommitDate: Tue Jul 12 21:29:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoolkit.gi= t;a=3Dcommit;h=3Dc7d95a92 Added support for file path in -L option --- pym/gentoolkit/revdep_rebuild/analyse.py | 16 +++++++++++++--- pym/gentoolkit/revdep_rebuild/rebuild.py | 9 ++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/re= vdep_rebuild/analyse.py index be696d1..d94365e 100644 --- a/pym/gentoolkit/revdep_rebuild/analyse.py +++ b/pym/gentoolkit/revdep_rebuild/analyse.py @@ -35,6 +35,7 @@ def prepare_checks(files_to_check, libraries, bits, cmd= _max_args): else: libs.append(d) dependencies.append([r[0],]) +=09 return (libs, dependencies) =20 =20 @@ -176,6 +177,13 @@ def analyse(settings, logger, libraries=3DNone, la_l= ibraries=3DNone, found_libs =3D [] dependencies =3D [] =20 + if _libs_to_check: + nltc =3D [] + for ltc in _libs_to_check: + if os.path.isfile(ltc): + ltc =3D scan(['-nBSF', '%S'], [ltc,], settings['CMD_MAX_ARGS'])[0].s= plit()[0] + nltc +=3D [ltc,] + _libs_to_check =3D nltc =20 _bits, linkg =3D platform.architecture() if _bits.startswith('32'): @@ -183,13 +191,15 @@ def analyse(settings, logger, libraries=3DNone, la_= libraries=3DNone, elif _bits.startswith('64'): bits =3D 64 =20 + import time + broken =3D [] for av_bits in glob.glob('/lib[0-9]*') or ('/lib32',): bits =3D int(av_bits[4:]) - _libraries =3D scan(['-M', str(bits), '-BF', '%F'], libraries+librarie= s_links, settings['CMD_MAX_ARGS']) - #call_program(['scanelf', '-M', str(bits), '-BF', '%F',] + libraries+l= ibraries_links).strip().split('\n') + + #_libraries =3D scan(['-M', str(bits), '-BF', '%F'], libraries+librari= es_links, settings['CMD_MAX_ARGS']) + _libraries =3D libraries+libraries_links =20 found_libs, dependencies =3D prepare_checks(libs_and_bins, _libraries,= bits, settings['CMD_MAX_ARGS']) - #print dependencies broken =3D find_broken(found_libs, _libraries, _libs_to_check) =20 bits /=3D 2 diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/re= vdep_rebuild/rebuild.py index f77d98c..5385b0e 100644 --- a/pym/gentoolkit/revdep_rebuild/rebuild.py +++ b/pym/gentoolkit/revdep_rebuild/rebuild.py @@ -92,6 +92,9 @@ def init_logger(settings): def parse_options(): """Parses the command line options an sets settings accordingly""" =20 + # @TODO: Verify: options: no-ld-path, no-order, no-progress are not app= liable=20 + # for revdep-ng + settings =3D DEFAULTS.copy() try: opts, args =3D getopt.getopt(sys.argv[1:],=20 @@ -155,11 +158,11 @@ def rebuild(logger, assigned, settings): logger.warn(bold('\nThere is nothing to emerge. Exiting.')) return 0 =20 - emerge_command =3D args + ' --oneshot ' + emerge_command + emerge_command =3D emerge_command =20 - logger.warn(yellow('\nemerge') + bold(emerge_command)) + logger.warn(yellow('\nemerge') + args + ' --oneshot ' + bold(emerge_com= mand)) =09 - success =3D os.system('emerge ' + emerge_command) + success =3D os.system('emerge ' + args + ' --oneshot ' + emerge_command= ) return success =20 =20