diff options
author | David Reyna <David.Reyna@windriver.com> | 2015-03-31 01:58:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-17 11:53:56 +0100 |
commit | ac69236d1d7dd27e7a73c590b34e78aed8bb0cce (patch) | |
tree | a439ae4fcad482d507644a8ee54ad27464990229 /bitbake | |
parent | 86f982c3df5dbac292ae3110ba2e8e73a9416575 (diff) | |
download | poky-ac69236d1d7dd27e7a73c590b34e78aed8bb0cce.tar.gz |
bitbake: toaster: add layer source in admin throws an error
Preset uninitialized object members to bootstrap new layer source creation.
[YOCTO #7437]
(Bitbake rev: 4de721aa75a4aaad186312443726e6daa764934b)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/orm/models.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 625eb1ee85..4a6ca8f2b1 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -640,17 +640,25 @@ class LayerSource(models.Model): | |||
640 | raise Exception("Abstract, update() must be implemented by all LayerSource-derived classes (object is %s)" % str(vars(self))) | 640 | raise Exception("Abstract, update() must be implemented by all LayerSource-derived classes (object is %s)" % str(vars(self))) |
641 | 641 | ||
642 | def save(self, *args, **kwargs): | 642 | def save(self, *args, **kwargs): |
643 | if isinstance(self, LocalLayerSource): | 643 | if self.sourcetype == LayerSource.TYPE_LOCAL: |
644 | self.sourcetype = LayerSource.TYPE_LOCAL | 644 | self.__class__ = LocalLayerSource |
645 | elif isinstance(self, LayerIndexLayerSource): | 645 | elif self.sourcetype == LayerSource.TYPE_LAYERINDEX: |
646 | self.sourcetype = LayerSource.TYPE_LAYERINDEX | 646 | self.__class__ = LayerIndexLayerSource |
647 | elif isinstance(self, ImportedLayerSource): | 647 | elif self.sourcetype == LayerSource.TYPE_IMPORTED: |
648 | self.sourcetype = LayerSource.TYPE_IMPORTED | 648 | self.__class__ = ImportedLayerSource |
649 | elif self.sourcetype == None: | 649 | elif self.sourcetype == None: |
650 | raise Exception("Unknown LayerSource-derived class. If you added a new layer source type, fill out all code stubs.") | 650 | raise Exception("Unknown LayerSource-derived class. If you added a new layer source type, fill out all code stubs.") |
651 | return super(LayerSource, self).save(*args, **kwargs) | 651 | return super(LayerSource, self).save(*args, **kwargs) |
652 | 652 | ||
653 | def get_object(self): | 653 | def get_object(self): |
654 | # preset an un-initilized object | ||
655 | if None == self.name: | ||
656 | self.name="" | ||
657 | if None == self.apiurl: | ||
658 | self.apiurl="" | ||
659 | if None == self.sourcetype: | ||
660 | self.sourcetype=LayerSource.TYPE_LOCAL | ||
661 | |||
654 | if self.sourcetype == LayerSource.TYPE_LOCAL: | 662 | if self.sourcetype == LayerSource.TYPE_LOCAL: |
655 | self.__class__ = LocalLayerSource | 663 | self.__class__ = LocalLayerSource |
656 | elif self.sourcetype == LayerSource.TYPE_LAYERINDEX: | 664 | elif self.sourcetype == LayerSource.TYPE_LAYERINDEX: |