diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-10 15:17:26 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-16 23:32:41 +0100 |
commit | cd6813ec0accb449ce309ce8c16d0131f5b0f1ff (patch) | |
tree | 9f67eed8db04b1096381e70e2ae2dcfb52cd43cc /bitbake/lib/toaster | |
parent | 973b6b961597e421d06607908300441de3ff4e0c (diff) | |
download | poky-cd6813ec0accb449ce309ce8c16d0131f5b0f1ff.tar.gz |
bitbake: toaster: fix local imports
Replaced local imports with absolute imports.
Used .module for local imports.
This should make the code to work on python 2 and python 3.
[YOCTO #9584]
(Bitbake rev: e38319b55d1acc6d784cc11a3bff3f0af20e974f)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
4 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py index d09ac17875..9bddadbf19 100644 --- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py +++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py | |||
@@ -79,7 +79,7 @@ def getBuildEnvironmentController(**kwargs): | |||
79 | The return object MUST always be a BuildEnvironmentController. | 79 | The return object MUST always be a BuildEnvironmentController. |
80 | """ | 80 | """ |
81 | 81 | ||
82 | from localhostbecontroller import LocalhostBEController | 82 | from bldcontrol.localhostbecontroller import LocalhostBEController |
83 | 83 | ||
84 | be = BuildEnvironment.objects.filter(Q(**kwargs))[0] | 84 | be = BuildEnvironment.objects.filter(Q(**kwargs))[0] |
85 | if be.betype == BuildEnvironment.TYPE_LOCAL: | 85 | if be.betype == BuildEnvironment.TYPE_LOCAL: |
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 7b2f126e98..b4e41968f1 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -32,7 +32,7 @@ import subprocess | |||
32 | 32 | ||
33 | from toastermain import settings | 33 | from toastermain import settings |
34 | 34 | ||
35 | from bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException, BitbakeController | 35 | from bldcontrol.bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException, BitbakeController |
36 | 36 | ||
37 | import logging | 37 | import logging |
38 | logger = logging.getLogger("toaster") | 38 | logger = logging.getLogger("toaster") |
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index 6b1da1b103..2407e1bbcc 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | |||
@@ -105,7 +105,7 @@ class Command(NoArgsCommand): | |||
105 | try: | 105 | try: |
106 | config_file = os.environ.get('TOASTER_CONF') | 106 | config_file = os.environ.get('TOASTER_CONF') |
107 | print("\nImporting file: %s" % config_file) | 107 | print("\nImporting file: %s" % config_file) |
108 | from loadconf import Command as LoadConfigCommand | 108 | from .loadconf import Command as LoadConfigCommand |
109 | 109 | ||
110 | LoadConfigCommand()._import_layer_config(config_file) | 110 | LoadConfigCommand()._import_layer_config(config_file) |
111 | # we run lsupdates after config update | 111 | # we run lsupdates after config update |
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py index 5022b59400..6d25df9e54 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py | |||
@@ -4,7 +4,7 @@ from orm.models import BitbakeVersion, Release, ReleaseDefaultLayer, ReleaseLaye | |||
4 | from django.db import IntegrityError | 4 | from django.db import IntegrityError |
5 | import os | 5 | import os |
6 | 6 | ||
7 | from checksettings import DN | 7 | from .checksettings import DN |
8 | 8 | ||
9 | import logging | 9 | import logging |
10 | logger = logging.getLogger("toaster") | 10 | logger = logging.getLogger("toaster") |