| 1 |
commit: 70edf148e08d843abe5c2a8bea262dc5e98330e1 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 10 16:36:15 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Feb 11 08:03:31 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=70edf148 |
| 7 |
|
| 8 |
revdep_rebuild: Initial pyflakes import and variable cleanup. |
| 9 |
|
| 10 |
Comment out some unused code for now which were causing some variable errors in pyflakes. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/gentoolkit/revdep_rebuild/analyse.py | 9 ++---- |
| 14 |
pym/gentoolkit/revdep_rebuild/assign.py | 50 +++++++++++++++----------------- |
| 15 |
2 files changed, 27 insertions(+), 32 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py |
| 18 |
index a32ea05..4b79c2b 100644 |
| 19 |
--- a/pym/gentoolkit/revdep_rebuild/analyse.py |
| 20 |
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py |
| 21 |
@@ -6,8 +6,6 @@ from __future__ import print_function |
| 22 |
|
| 23 |
import os |
| 24 |
import re |
| 25 |
-import platform |
| 26 |
-import glob |
| 27 |
|
| 28 |
from portage.output import bold, blue, yellow, green |
| 29 |
|
| 30 |
@@ -56,7 +54,6 @@ def prepare_checks(files_to_check, libraries, bits, cmd_max_args): |
| 31 |
|
| 32 |
|
| 33 |
def scan_files(libs_and_bins, cmd_max_args): |
| 34 |
- import os |
| 35 |
|
| 36 |
scanned_files = {} # {bits: {soname: (filename, needed), ...}, ...} |
| 37 |
for line in scan(['-nBF', '%F %f %S %n %M'], libs_and_bins, cmd_max_args): |
| 38 |
@@ -184,7 +181,7 @@ def main_checks(found_libs, broken_list, dependencies, logger): |
| 39 |
|
| 40 |
for broken in broken_list: |
| 41 |
found = found_libs[broken] |
| 42 |
- logger.info('Broken files that requires: ' + bold(f)) |
| 43 |
+ logger.info('Broken files that requires: ' + bold(found)) |
| 44 |
for dep_path in dependencies[broken]: |
| 45 |
logger.info(yellow(' * ') + dep_path) |
| 46 |
broken_pathes.append(dep_path) |
| 47 |
@@ -276,9 +273,9 @@ def analyse(settings, logger, libraries=None, la_libraries=None, |
| 48 |
|
| 49 |
return assign_packages(broken_pathes, logger, settings) |
| 50 |
|
| 51 |
- import sys |
| 52 |
- sys.exit() |
| 53 |
|
| 54 |
+ #import sys |
| 55 |
+ #sys.exit() |
| 56 |
#l = [] |
| 57 |
#for line in call_program(['scanelf', '-M', '64', '-BF', '%F',] + libraries).strip().split('\n'): |
| 58 |
#l.append(line) |
| 59 |
|
| 60 |
diff --git a/pym/gentoolkit/revdep_rebuild/assign.py b/pym/gentoolkit/revdep_rebuild/assign.py |
| 61 |
index 2a93fe1..4842ea9 100644 |
| 62 |
--- a/pym/gentoolkit/revdep_rebuild/assign.py |
| 63 |
+++ b/pym/gentoolkit/revdep_rebuild/assign.py |
| 64 |
@@ -10,11 +10,9 @@ import os |
| 65 |
import re |
| 66 |
|
| 67 |
import portage |
| 68 |
-from portage.versions import catpkgsplit |
| 69 |
from portage import portdb |
| 70 |
from portage.output import bold, red, yellow |
| 71 |
-from gentoolkit.helpers import get_installed_cpvs |
| 72 |
-from gentoolkit.package import Package |
| 73 |
+#from gentoolkit.package import Package |
| 74 |
|
| 75 |
# Make all str conversions unicode |
| 76 |
try: |
| 77 |
@@ -47,29 +45,29 @@ def assign_packages(broken, logger, settings): |
| 78 |
|
| 79 |
return assigned |
| 80 |
|
| 81 |
- # Map all files in CONTENTS database to package names |
| 82 |
- fname_pkg_dict = {} |
| 83 |
- for pkg in pkgset: |
| 84 |
- contents = Package(pkg).parsed_contents() |
| 85 |
- for fname in contents.keys(): |
| 86 |
- if contents[fname][0] == "obj": |
| 87 |
- fname_pkg_dict[fname] = str(pkg) |
| 88 |
- |
| 89 |
- for fname in broken: |
| 90 |
- realname = os.path.realpath(fname) |
| 91 |
- if realname in fname_pkg_dict.keys(): |
| 92 |
- pkgname = fname_pkg_dict[realname] |
| 93 |
- elif fname in fname_pkg_dict.keys(): |
| 94 |
- pkgname = fname_pkg_dict[fname] |
| 95 |
- else: |
| 96 |
- pkgname = None |
| 97 |
- if pkgname and pkgname not in assigned: |
| 98 |
- assigned.add(pkgname) |
| 99 |
- if not pkgname: |
| 100 |
- pkgname = "(none)" |
| 101 |
- logger.info('\t' + fname + ' -> ' + bold(pkgname)) |
| 102 |
- |
| 103 |
- return assigned |
| 104 |
+ ## Map all files in CONTENTS database to package names |
| 105 |
+ #fname_pkg_dict = {} |
| 106 |
+ #for pkg in pkgset: |
| 107 |
+ #contents = Package(pkg).parsed_contents() |
| 108 |
+ #for fname in contents.keys(): |
| 109 |
+ #if contents[fname][0] == "obj": |
| 110 |
+ #fname_pkg_dict[fname] = str(pkg) |
| 111 |
+ |
| 112 |
+ #for fname in broken: |
| 113 |
+ #realname = os.path.realpath(fname) |
| 114 |
+ #if realname in fname_pkg_dict.keys(): |
| 115 |
+ #pkgname = fname_pkg_dict[realname] |
| 116 |
+ #elif fname in fname_pkg_dict.keys(): |
| 117 |
+ #pkgname = fname_pkg_dict[fname] |
| 118 |
+ #else: |
| 119 |
+ #pkgname = None |
| 120 |
+ #if pkgname and pkgname not in assigned: |
| 121 |
+ #assigned.add(pkgname) |
| 122 |
+ #if not pkgname: |
| 123 |
+ #pkgname = "(none)" |
| 124 |
+ #logger.info('\t' + fname + ' -> ' + bold(pkgname)) |
| 125 |
+ |
| 126 |
+ #return assigned |
| 127 |
|
| 128 |
def get_best_match(cpv, cp, logger): |
| 129 |
"""Tries to find another version of the pkg with the same slot |
Archives