diff options
Diffstat (limited to 'bitbake/lib/toaster/toastermain/management/commands')
-rw-r--r-- | bitbake/lib/toaster/toastermain/management/commands/buildimport.py | 4 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastermain/management/commands/checksocket.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py index 59da6ff7ac..f7139aa041 100644 --- a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py +++ b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py | |||
@@ -451,7 +451,7 @@ class Command(BaseCommand): | |||
451 | # Catch vars relevant to Toaster (in case no Toaster section) | 451 | # Catch vars relevant to Toaster (in case no Toaster section) |
452 | self.update_project_vars(project,'DISTRO') | 452 | self.update_project_vars(project,'DISTRO') |
453 | self.update_project_vars(project,'MACHINE') | 453 | self.update_project_vars(project,'MACHINE') |
454 | self.update_project_vars(project,'IMAGE_INSTALL_append') | 454 | self.update_project_vars(project,'IMAGE_INSTALL:append') |
455 | self.update_project_vars(project,'IMAGE_FSTYPES') | 455 | self.update_project_vars(project,'IMAGE_FSTYPES') |
456 | self.update_project_vars(project,'PACKAGE_CLASSES') | 456 | self.update_project_vars(project,'PACKAGE_CLASSES') |
457 | # These vars are typically only assigned by Toaster | 457 | # These vars are typically only assigned by Toaster |
@@ -545,7 +545,7 @@ class Command(BaseCommand): | |||
545 | # Find the directory's release, and promote to default_release if local paths | 545 | # Find the directory's release, and promote to default_release if local paths |
546 | release = self.find_import_release(layers_list,lv_dict,default_release) | 546 | release = self.find_import_release(layers_list,lv_dict,default_release) |
547 | # create project, SANITY: reuse any project of same name | 547 | # create project, SANITY: reuse any project of same name |
548 | project = Project.objects.create_project(project_name,release,project) | 548 | project = Project.objects.create_project(project_name,release,project, imported=True) |
549 | # Apply any new layers or variables | 549 | # Apply any new layers or variables |
550 | self.apply_conf_variables(project,layers_list,lv_dict,release) | 550 | self.apply_conf_variables(project,layers_list,lv_dict,release) |
551 | # WORKAROUND: since we now derive the release, redirect 'newproject_specific' to 'project_specific' | 551 | # WORKAROUND: since we now derive the release, redirect 'newproject_specific' to 'project_specific' |
diff --git a/bitbake/lib/toaster/toastermain/management/commands/checksocket.py b/bitbake/lib/toaster/toastermain/management/commands/checksocket.py index 811fd5d516..b2c002da7a 100644 --- a/bitbake/lib/toaster/toastermain/management/commands/checksocket.py +++ b/bitbake/lib/toaster/toastermain/management/commands/checksocket.py | |||
@@ -13,7 +13,7 @@ import errno | |||
13 | import socket | 13 | import socket |
14 | 14 | ||
15 | from django.core.management.base import BaseCommand, CommandError | 15 | from django.core.management.base import BaseCommand, CommandError |
16 | from django.utils.encoding import force_text | 16 | from django.utils.encoding import force_str |
17 | 17 | ||
18 | DEFAULT_ADDRPORT = "0.0.0.0:8000" | 18 | DEFAULT_ADDRPORT = "0.0.0.0:8000" |
19 | 19 | ||
@@ -51,7 +51,7 @@ class Command(BaseCommand): | |||
51 | if hasattr(err, 'errno') and err.errno in errors: | 51 | if hasattr(err, 'errno') and err.errno in errors: |
52 | errtext = errors[err.errno] | 52 | errtext = errors[err.errno] |
53 | else: | 53 | else: |
54 | errtext = force_text(err) | 54 | errtext = force_str(err) |
55 | raise CommandError(errtext) | 55 | raise CommandError(errtext) |
56 | 56 | ||
57 | self.stdout.write("OK") | 57 | self.stdout.write("OK") |