From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 43C7A1388C0 for ; Thu, 25 Feb 2016 21:26:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 303D7E07C2; Thu, 25 Feb 2016 21:26:54 +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 C760EE07C2 for ; Thu, 25 Feb 2016 21:26:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FC02340CDA for ; Thu, 25 Feb 2016 21:26:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBF82C6F for ; Thu, 25 Feb 2016 21:26:47 +0000 (UTC) From: "Brian Dolbec" 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" Message-ID: <1456435495.1727a4ad664daa5b98d7e2e15af8cfc59d13f4dc.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master 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: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 1727a4ad664daa5b98d7e2e15af8cfc59d13f4dc X-VCS-Branch: master Date: Thu, 25 Feb 2016 21:26:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2e8e4d06-fea4-4052-a1d9-b94f1692cb61 X-Archives-Hash: aa8d2a530e708a76609e0032a40cef2e commit: 1727a4ad664daa5b98d7e2e15af8cfc59d13f4dc Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 18 19:47:26 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 25 21:24:55 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=1727a4ad revdep-rebuild/analyse.py: Add file masks to the collecting masks file_masks appear to have been missed being added to the masks passed to the collections functions. Hopefully this will resolve most of the errors people are getting. My testing, only bacula has any errors, but it does not work to add the offending symlink target lib to LD_LIBRARY_MASK. pym/gentoolkit/revdep_rebuild/analyse.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py index 92233ab..b9c18c0 100644 --- a/pym/gentoolkit/revdep_rebuild/analyse.py +++ b/pym/gentoolkit/revdep_rebuild/analyse.py @@ -320,9 +320,15 @@ def analyse(settings, logger, libraries=None, la_libraries=None, stime = current_milli_time() logger.info(green(' * ') + bold('Collecting dynamic linking informations')) + all_masks = masked_dirs.copy() + all_masks.update(masked_files) + logger.debug("\tall_masks:") + for x in sorted(all_masks): + logger.debug('\t\t%s' % (x)) + libraries, la_libraries, libraries_links = \ - collect_libraries_from_dir(lib_dirs, masked_dirs, logger) - binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logger) + collect_libraries_from_dir(lib_dirs, all_masks, logger) + binaries = collect_binaries_from_dir(bin_dirs, all_masks, logger) ftime = current_milli_time() logger.debug('\ttime to complete task: %d milliseconds' % (ftime-stime))