Fix ImageBuildManager initialization after BaseImageManager changes
BaseImageManager's init function used to take two arguments: 'config_files' and 'images' in that order. Commit08a8118f1b
added another one in between the two, 'template_dir'. ImageBuildManager inherits from BaseImageManager and calls its init function with 'config_files' and 'images' as positional arguments, which no longer works because 'images' is now the third argument. Therefore the value passed as 'images' gets quietly written as 'template_dir' instead. Passing 'images' as a keyword argument instead solves the issue. Change-Id: I591345985ccbb8ebfdf9848104478ec1aadb4a7f (cherry picked from commit6939ec8b46
)
This commit is contained in:
parent
efae439343
commit
e759bf395f
|
@ -37,7 +37,7 @@ class ImageBuildManager(BaseImageManager):
|
||||||
|
|
||||||
def __init__(self, config_files, images=None, output_directory='.',
|
def __init__(self, config_files, images=None, output_directory='.',
|
||||||
skip=False):
|
skip=False):
|
||||||
super(ImageBuildManager, self).__init__(config_files, images)
|
super(ImageBuildManager, self).__init__(config_files, images=images)
|
||||||
self.output_directory = re.sub('[/]$', '', output_directory)
|
self.output_directory = re.sub('[/]$', '', output_directory)
|
||||||
self.skip = skip
|
self.skip = skip
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue