diff options
| -rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | 48 | ||||
| -rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py | 8 |
2 files changed, 6 insertions, 50 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index 5e70437b243..bf02b696a57 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py @@ -1,58 +1,15 @@ from django.core.management.base import NoArgsCommand, CommandError -from django.db import transaction -from bldcontrol.bbcontroller import getBuildEnvironmentController, ShellCmdException from bldcontrol.models import BuildRequest, BuildEnvironment, BRError from orm.models import ToasterSetting, Build import os import traceback -def DN(path): - if path is None: - return "" - else: - return os.path.dirname(path) - - class Command(NoArgsCommand): args = "" help = "Verifies that the configured settings are valid and usable, or prompts the user to fix the settings." def __init__(self, *args, **kwargs): super(Command, self).__init__(*args, **kwargs) - self.guesspath = DN(DN(DN(DN(DN(DN(DN(__file__))))))) - - def _find_first_path_for_file(self, startdirectory, filename, level=0): - if level < 0: - return None - dirs = [] - for i in os.listdir(startdirectory): - j = os.path.join(startdirectory, i) - if os.path.isfile(j): - if i == filename: - return startdirectory - elif os.path.isdir(j): - dirs.append(j) - for j in dirs: - ret = self._find_first_path_for_file(j, filename, level - 1) - if ret is not None: - return ret - return None - - def _recursive_list_directories(self, startdirectory, level=0): - if level < 0: - return [] - dirs = [] - try: - for i in os.listdir(startdirectory): - j = os.path.join(startdirectory, i) - if os.path.isdir(j): - dirs.append(j) - except OSError: - pass - for j in dirs: - dirs = dirs + self._recursive_list_directories(j, level - 1) - return dirs - def _verify_build_environment(self): # provide a local build env. This will be extended later to include non local @@ -94,13 +51,11 @@ class Command(NoArgsCommand): print "\n -- Validation: The build directory must to be set to an absolute path." is_changed = _update_builddir() - if is_changed: print "\nBuild configuration saved" be.save() return True - if be.needs_import: try: config_file = os.environ.get('TOASTER_CONF') @@ -119,7 +74,6 @@ class Command(NoArgsCommand): print "Failure while trying to import the toaster config file %s: %s" %\ (config_file, e) traceback.print_exc(e) - return is_changed while _verify_be(): @@ -150,8 +104,6 @@ class Command(NoArgsCommand): return 0 - - def handle_noargs(self, **options): retval = 0 retval += self._verify_build_environment() diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py index 5022b59400d..4847fe1cec5 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py @@ -4,11 +4,15 @@ from orm.models import BitbakeVersion, Release, ReleaseDefaultLayer, ReleaseLaye from django.db import IntegrityError import os -from checksettings import DN - import logging logger = logging.getLogger("toaster") +def DN(path): + if path is None: + return "" + else: + return os.path.dirname(path) + def _reduce_canon_path(path): components = [] for c in path.split("/"): |