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 1Qgkne-0002Vi-Fy for garchives@archives.gentoo.org; Tue, 12 Jul 2011 21:47:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAF1B21C271; Tue, 12 Jul 2011 21:45:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 92C8D21C257 for ; Tue, 12 Jul 2011 21:45:27 +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 2923A2AC059 for ; Tue, 12 Jul 2011 21:45:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8855F8003E for ; Tue, 12 Jul 2011 21:45:26 +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: <4a02c44bbe7457249caeb07464e240b6bc035cc0.fuzzyray@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 pym/gentoolkit/revdep_rebuild/cache.py pym/gentoolkit/revdep_rebuild/collect.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: 4a02c44bbe7457249caeb07464e240b6bc035cc0 Date: Tue, 12 Jul 2011 21:45:26 +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: badd5d3f532a3a1e0427e94e941fce9e commit: 4a02c44bbe7457249caeb07464e240b6bc035cc0 Author: dol-sen gmail com> AuthorDate: Mon Apr 25 07:03:20 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=3D4a02c44b more cleanup of importing logging. Use the one defined or passed in to i= n main().=20 --- pym/gentoolkit/revdep_rebuild/analyse.py | 11 ++++++++--- pym/gentoolkit/revdep_rebuild/cache.py | 14 +++++++++----- pym/gentoolkit/revdep_rebuild/collect.py | 5 +++-- pym/gentoolkit/revdep_rebuild/rebuild.py | 17 ++++++++++++----- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/re= vdep_rebuild/analyse.py index 5ee0c7b..521d8b9 100644 --- a/pym/gentoolkit/revdep_rebuild/analyse.py +++ b/pym/gentoolkit/revdep_rebuild/analyse.py @@ -3,8 +3,8 @@ import os import re import platform -import logging import glob + from portage.output import bold, red, blue, yellow, green, nocolor =20 from stuff import scan @@ -114,7 +114,7 @@ def main_checks(found_libs, broken, dependencies, log= ger): return broken_pathes =20 =20 -def analyse(settings=3DNone, logger=3DNone, libraries=3DNone, la_librari= es=3DNone, +def analyse(settings, logger, libraries=3DNone, la_libraries=3DNone, libraries_links=3DNone, binaries=3DNone, _libs_to_check=3Dset()): """Main program body. It will collect all info and determine the pkgs needing rebuilding. @@ -143,7 +143,12 @@ def analyse(settings=3DNone, logger=3DNone, librarie= s=3DNone, la_libraries=3DNone, binaries =3D collect_binaries_from_dir(bin_dirs, masked_dirs, logger) =20 if settings['USE_TMP_FILES']: - save_cache(to_save=3D{'libraries':libraries, 'la_libraries':la_librar= ies, 'libraries_links':libraries_links, 'binaries':binaries}) + save_cache(logger=3Dlogger,=20 + to_save=3D{'libraries':libraries, 'la_libraries':la_libraries, + 'libraries_links':libraries_links, 'binaries':binaries + }, + temp_path=3Dsettings['DEFAULT_TMP_DIR'] + ) =20 =20 logger.debug('Found '+ str(len(libraries)) + ' libraries (+' + str(len(= libraries_links)) + ' symlinks) and ' + str(len(binaries)) + ' binaries') diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revd= ep_rebuild/cache.py index e1a8e11..8b1a8ed 100644 --- a/pym/gentoolkit/revdep_rebuild/cache.py +++ b/pym/gentoolkit/revdep_rebuild/cache.py @@ -2,7 +2,7 @@ =20 import os import time -import logging + from portage.output import red from settings import DEFAULTS =20 @@ -29,7 +29,7 @@ def read_cache(temp_path=3DDEFAULTS['DEFAULT_TMP_DIR'])= : return (ret['libraries'], ret['la_libraries'], ret['libraries_links'], = ret['binaries']) =20 =20 -def save_cache(logger=3Dlogging, to_save=3D{}, temp_path=3DDEFAULTS['DEF= AULT_TMP_DIR']): +def save_cache(logger, to_save=3D{}, temp_path=3DDEFAULTS['DEFAULT_TMP_D= IR']): ''' Tries to store caching information. @param logger @param to_save have to be dict with keys: libraries, la_libraries, lib= raries_links and binaries @@ -87,6 +87,7 @@ if __name__ =3D=3D '__main__': print 'Preparing cache ... ' =20 from collect import * + import logging =20 bin_dirs, lib_dirs =3D prepare_search_dirs() =20 @@ -95,9 +96,12 @@ if __name__ =3D=3D '__main__': bin_dirs =3D bin_dirs.union(ld) masked_dirs =3D masked_dirs.union(set(['/lib/modules', '/lib32/modules'= , '/lib64/modules',])) =20 - libraries, la_libraries, libraries_links, symlink_pairs =3D collect_lib= raries_from_dir(lib_dirs, masked_dirs) - binaries =3D collect_binaries_from_dir(bin_dirs, masked_dirs) + libraries, la_libraries, libraries_links, symlink_pairs =3D collect_lib= raries_from_dir(lib_dirs, masked_dirs, logging) + binaries =3D collect_binaries_from_dir(bin_dirs, masked_dirs, logging) =20 - save_cache(to_save=3D{'libraries':libraries, 'la_libraries':la_librarie= s, 'libraries_links':libraries_links, 'binaries':binaries}) + save_cache(logger=3Dlogging,=20 + to_save=3D{'libraries':libraries, 'la_libraries':la_libraries,=20 + 'libraries_links':libraries_links, 'binaries':binaries} + ) =20 print 'Done.' diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/re= vdep_rebuild/collect.py index 735857b..b408edc 100644 --- a/pym/gentoolkit/revdep_rebuild/collect.py +++ b/pym/gentoolkit/revdep_rebuild/collect.py @@ -4,7 +4,7 @@ import re import os import glob import stat -import logging + import portage from portage.output import bold, red, blue, yellow, green, nocolor =20 @@ -185,7 +185,7 @@ def collect_libraries_from_dir(dirs, mask, logger): return (found_files, found_la_files, found_symlinks, symlink_pairs) =20 =20 -def collect_binaries_from_dir(dirs, mask, logger=3Dlogging): +def collect_binaries_from_dir(dirs, mask, logger): ''' Collects all binaries from specified list of directories. mask is list of pathes, that are ommited in scanning, can be eighter s= ingle file or entire directory Returns list of binaries @@ -229,6 +229,7 @@ def collect_binaries_from_dir(dirs, mask, logger=3Dlo= gging): =20 =20 if __name__ =3D=3D '__main__': + import logging bin_dirs, lib_dirs =3D prepare_search_dirs(logging) =20 masked_dirs, masked_files, ld =3D parse_revdep_config() diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/re= vdep_rebuild/rebuild.py index 6185e0c..6c08f5b 100644 --- a/pym/gentoolkit/revdep_rebuild/rebuild.py +++ b/pym/gentoolkit/revdep_rebuild/rebuild.py @@ -169,13 +169,14 @@ def rebuild(logger, assigned, settings): =20 =20 # Runs from here -def main(settings=3DNone): +def main(settings=3DNone, logger=3DNone): =20 if settings is None: print("NO Input settings, using defaults...") settings =3D DEFAULTS.copy() =20 - logger =3D init_logger(settings) + if logger is None: + logger =3D init_logger(settings) =20 _libs_to_check =3D settings['library'] =20 @@ -199,9 +200,15 @@ def main(settings=3DNone): settings['PRETEND'] =3D True =20 analyze_cache =3D {} - if settings['USE_TMP_FILES'] and check_temp_files(): - libraries, la_libraries, libraries_links, binaries =3D read_cache() - assigned =3D analyse(libraries=3Dlibraries, la_libraries=3Dla_librarie= s,=20 + if settings['USE_TMP_FILES'] \ + and check_temp_files(settings['DEFAULT_TMP_DIR']): + libraries, la_libraries, libraries_links, binaries =3D read_cache( + settings['DEFAULT_TMP_DIR']) + assigned =3D analyse( + settings=3Dsettings, + logger=3Dlogger, + libraries=3Dlibraries, + la_libraries=3Dla_libraries,=20 libraries_links=3Dlibraries_links, binaries=3Dbinaries, _libs_to_check=3D_libs_to_check)