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-339667-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QEwkg-0006IN-OO
for garchives@archives.gentoo.org; Wed, 27 Apr 2011 04:53:26 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5993D1C012;
Wed, 27 Apr 2011 04:53:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 10A9B1C012
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Apr 2011 04:53:18 +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 46F171B4010
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Apr 2011 04:53:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 65EAF80505
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Apr 2011 04:53:17 +0000 (UTC)
From: "Sławek Lis" <lis.slawek@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sławek Lis" <lis.slawek@gmail.com>
Message-ID: <ade3a26d6ac1003bd221cb3611567d175de5cf8b.slis@gentoo>
Subject: [gentoo-commits] proj/gentoolkit:revdep-rebuild 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: slis
X-VCS-Committer-Name: Sławek Lis
X-VCS-Revision: ade3a26d6ac1003bd221cb3611567d175de5cf8b
Date: Wed, 27 Apr 2011 04:53:17 +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: daeadd67d2b1a516d846df658aa4b0ef
commit: ade3a26d6ac1003bd221cb3611567d175de5cf8b
Author: Slawek <lis.slawek <AT> gmail <DOT> com>
AuthorDate: Wed Apr 27 04:21:03 2011 +0000
Commit: S=C5=82awek Lis <lis.slawek <AT> gmail <DOT> com>
CommitDate: Wed Apr 27 04:21:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoolkit.gi=
t;a=3Dcommit;h=3Dade3a26d
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