diff options
| author | Yegor Yefremov <yegorslists@googlemail.com> | 2017-03-21 09:22:33 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-03-31 00:43:18 +0200 |
| commit | ac75d32ae79aed38e003361503a601edad384d23 (patch) | |
| tree | 4dfa3cfd43211024c441f46e657de3c29edc0222 /support/scripts | |
| parent | eaadfab8e8c77d9b66b0b9b1215a6ebd0ca6307c (diff) | |
| download | buildroot-ac75d32ae79aed38e003361503a601edad384d23.tar.gz buildroot-ac75d32ae79aed38e003361503a601edad384d23.zip | |
graph-depends: rename pkgutil.py to brpkgutil.py
pkgutil.py is also part of Python itself. Placing pkgutil.py as is
in a folder with other scripts that require original pkgutil will
break them. This is the case with scanpypi. So rename pkgutil.py
to brpkgutil.py to avoid naming collision.
Fixes: https://bugs.busybox.net/show_bug.cgi?id=9766
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
(cherry picked from commit 3b627c89dc8adf8c60efd773935bf66004e8433d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support/scripts')
| -rw-r--r-- | support/scripts/brpkgutil.py (renamed from support/scripts/pkgutil.py) | 0 | ||||
| -rwxr-xr-x | support/scripts/graph-depends | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/support/scripts/pkgutil.py b/support/scripts/brpkgutil.py index a0e2352bad..a0e2352bad 100644 --- a/support/scripts/pkgutil.py +++ b/support/scripts/brpkgutil.py diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index fbd5917053..b258c565b0 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -26,7 +26,7 @@ import subprocess import argparse from fnmatch import fnmatch -import pkgutil +import brpkgutil # Modes of operation: MODE_FULL = 1 # draw full dependency graph for all selected packages @@ -102,13 +102,13 @@ else: transitive = args.transitive if args.direct: - get_depends_func = pkgutil.get_depends + get_depends_func = brpkgutil.get_depends arrow_dir = "forward" else: if mode == MODE_FULL: sys.stderr.write("--reverse needs a package\n") sys.exit(1) - get_depends_func = pkgutil.get_rdepends + get_depends_func = brpkgutil.get_rdepends arrow_dir = "back" # Get the colours: we need exactly three colours, @@ -330,7 +330,7 @@ if check_only: sys.exit(0) dict_deps = remove_extra_deps(dict_deps) -dict_version = pkgutil.get_version([pkg for pkg in allpkgs +dict_version = brpkgutil.get_version([pkg for pkg in allpkgs if pkg != "all" and not pkg.startswith("root")]) # Print the attributes of a node: label and fill-color |
