[gentoo-commits] proj/pax-utils:master commit in: /

["Mike Frysinger" <vapier@gentoo.org>]

commit:     8e182fd12056c7d3703c517e3d43cecf98bb7060
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Thu Mar 26 19:16:27 2020 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 23:12:55 2021 +0000
URL:        https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=8e182fd1

lddtree: re-enable long line checks

Adjust our line length to be 100 cols.  This matches what the code has
largely been using already, and it fits better with modern systems.
People can still write to 80 cols as makes sense, but we'll consider
that a soft limit with 100 cols as the upper hard limit.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 .pylintrc  | 2 +-
 lddtree.py | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 577641f..b86319b 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -35,7 +35,7 @@ reports=no
 score=no
 
 [FORMAT]
-max-line-length=80
+max-line-length = 100
 indent-string = '    '
 
 [BASIC]

diff --git a/lddtree.py b/lddtree.py
index cdb3f1c..3420b7d 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -4,7 +4,6 @@
 # Copyright 2012-2014 Mike Frysinger <vapier@gentoo.org>
 # Copyright 2012-2014 The Chromium OS Authors
 # Use of this source code is governed by a BSD-style license (BSD-3)
-# pylint: disable=C0301
 
 """Read the ELF dependency tree and show it
 
@@ -477,7 +476,13 @@ def ParseELF(path, root='/', prefix='', ldpaths={'conf':[], 'env':[], 'interp':[
             if lib in _all_libs:
                 continue
             if all_ldpaths is None:
-                all_ldpaths = rpaths + ldpaths['rpath'] + ldpaths['env'] + runpaths + ldpaths['runpath'] + ldpaths['conf'] + ldpaths['interp']
+                all_ldpaths = (
+                    rpaths + ldpaths['rpath'] +
+                    ldpaths['env'] +
+                    runpaths + ldpaths['runpath'] +
+                    ldpaths['conf'] +
+                    ldpaths['interp']
+                )
             realpath, fullpath = FindLib(elf, lib, all_ldpaths, root, debug=debug)
             _all_libs[lib] = {
                 'realpath': realpath,