From dd504ddf48e2e264e6d8d5b3ad6b2131f93b8de0 Mon Sep 17 00:00:00 2001 From: lixinyu Date: Tue, 2 Jan 2024 17:13:06 +0800 Subject: [PATCH] update: fix a bug * the code in update docker block has bug that when env.yaml don't has docker_image label there will be raise error, now fix it. Signed-off-by: lixinyu --- src/oebuild/app/plugins/update/update.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/oebuild/app/plugins/update/update.py b/src/oebuild/app/plugins/update/update.py index ae69a14..6b2630b 100644 --- a/src/oebuild/app/plugins/update/update.py +++ b/src/oebuild/app/plugins/update/update.py @@ -187,17 +187,21 @@ class Update(OebuildCommand): and if the version branch does not correspond to it, it will enter interactive mode, which is selected by the user ''' + oebuild_config = self.configure.parse_oebuild_config() + docker_config = oebuild_config.docker + check_docker_tag = CheckDockerTag(docker_tag=docker_tag,configure=self.configure) if docker_tag is not None: - oebuild_config = self.configure.parse_oebuild_config() - docker_config = oebuild_config.docker - - check_docker_tag = CheckDockerTag(docker_tag=docker_tag,configure=self.configure) if check_docker_tag.get_tag() is None or check_docker_tag.get_tag() == "": check_docker_tag.list_image_tag() return docker_image = docker_config.repo_url + ":" + check_docker_tag.get_tag() else: docker_image = YoctoEnv().get_docker_image(self.configure.source_yocto_dir()) + if docker_image is None or docker_image == "": + if check_docker_tag.get_tag() is None or check_docker_tag.get_tag() == "": + check_docker_tag.list_image_tag() + return + docker_image = docker_config.repo_url + ":" + check_docker_tag.get_tag() client = DockerProxy() logger.info("pull %s ...", docker_image) -- Gitee