From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-666674-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 8E539138D02
for <garchives@archives.gentoo.org>; Tue, 11 Feb 2014 18:49:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8D004E0B94;
Tue, 11 Feb 2014 18:49:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DF301E0B94
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Feb 2014 18:49:50 +0000 (UTC)
Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0E54433F937
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Feb 2014 18:49:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by spoonbill.gentoo.org (Postfix) with ESMTP id A764018852
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Feb 2014 18:49:47 +0000 (UTC)
From: "Brian Dolbec" <brian.dolbec@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" <brian.dolbec@gmail.com>
Message-ID: <1392142880.8ba9173f9c082a432a965621b4282e5bbf510e47.dol-sen@gentoo>
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
X-VCS-Directories: pym/gentoolkit/revdep_rebuild/
X-VCS-Committer: dol-sen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: 8ba9173f9c082a432a965621b4282e5bbf510e47
X-VCS-Branch: gentoolkit
Date: Tue, 11 Feb 2014 18:49:47 +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
X-Archives-Salt: c958c76a-0df1-4977-83cb-82eef4017d2e
X-Archives-Hash: 5744f2498cc2e7f6ed1f613638ee887c
commit: 8ba9173f9c082a432a965621b4282e5bbf510e47
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 18:21:20 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Feb 11 18:21:20 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=8ba9173f
Fix incorrect reporting of some broken files, pkgs.
Fixes previous commit.
commit: cfeb731d0dc40988cf11f6c225e7082f563d5b18
Brian Dolbec <dolsen <AT> gentoo.org> (Tue 11 Feb 2014 12:08:38 AM PST)
revdep_rebuild/analyse.py: Fix the bug that caused some breakage to not be detected.
---
pym/gentoolkit/revdep_rebuild/analyse.py | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py
index 8b64835..c416c3c 100644
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@ -106,28 +106,23 @@ def find_broken2(scanned_files, logger):
for l in needed:
if l+'|' not in alllibs:
try:
- broken_libs[bits][l].add(soname)
+ broken_libs[bits][l].add(filename)
except KeyError:
try:
- broken_libs[bits][l] = set([soname])
+ broken_libs[bits][l] = set([filename])
except KeyError:
- broken_libs = {bits: {l: set([soname])}}
- #print("BROKEN:", soname, l)
-
+ broken_libs = {bits: {l: set([filename])}}
return broken_libs
def main_checks2(broken, scanned_files, logger):
broken_pathes = []
for bits, _broken in broken.items():
- for lib, needed in _broken.items():
- #print("lib, needed:", lib, needed)
+ for lib, files in _broken.items():
logger.info('Broken files that requires: %s (%s bits)' % (bold(lib), bits))
- for n in needed:
- #print(sorted(needed))
- for fp in sorted(scanned_files[bits][n]):
- logger.info(yellow(' * ') + n + ' (' + fp + ')')
- broken_pathes.append(fp)
+ for fp in sorted(files):
+ logger.info(yellow(' * ') + fp)
+ broken_pathes.append(fp)
return broken_pathes