Skip to content
Snippets Groups Projects
Commit 7feccfdc authored by Simon Glass's avatar Simon Glass
Browse files

binman: Put our local modules ahead of system modules


If a system module is named the same as one of those used by binman we
currently pick the system module. Adjust the ordering so that our modules
are chosen instead.

The module conflict reported was 'tools' from jira-python. I cannot access
that package to test it.

Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
Reported-by: default avatarKevin Hilman <khilman@baylibre.com>
Acked-by: default avatarKevin Hilman <khilman@baylibre.com>
parent c0791928
No related branches found
No related tags found
No related merge requests found
...@@ -17,15 +17,14 @@ import unittest ...@@ -17,15 +17,14 @@ import unittest
# Bring in the patman and dtoc libraries # Bring in the patman and dtoc libraries
our_path = os.path.dirname(os.path.realpath(__file__)) our_path = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(our_path, '../patman')) for dirname in ['../patman', '../dtoc', '..']:
sys.path.append(os.path.join(our_path, '../dtoc')) sys.path.insert(0, os.path.join(our_path, dirname))
sys.path.append(os.path.join(our_path, '../'))
# Bring in the libfdt module # Bring in the libfdt module
sys.path.append('tools') sys.path.insert(0, 'tools')
# Also allow entry-type modules to be brought in from the etype directory. # Also allow entry-type modules to be brought in from the etype directory.
sys.path.append(os.path.join(our_path, 'etype')) sys.path.insert(0, os.path.join(our_path, 'etype'))
import cmdline import cmdline
import command import command
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment