diff --git a/src/oebuild/check_docker_tag.py b/src/oebuild/check_docker_tag.py index 35c43c13b71805ddfe03341fd6b759f4f49019e1..5ba23d44e5fcd8cef36b15cdb19f841bcbae2742 100644 --- a/src/oebuild/check_docker_tag.py +++ b/src/oebuild/check_docker_tag.py @@ -65,18 +65,18 @@ the openeuler embedded docker tag can be selected list: if self.docker_tag not in self.tag_list: return None else: - return self.docker_tag + return str(self.docker_tag) yocto_dir = self.configure.source_yocto_dir() env_path = os.path.join(yocto_dir,".oebuild/env.yaml") if os.path.exists(env_path): env_parse = oebuild_util.read_yaml(pathlib.Path(env_path)) - return env_parse['docker_tag'] + return str(env_parse['docker_tag']) yocto_repo = Repo.init(yocto_dir) oebuild_config = self.configure.parse_oebuild_config() docker_config = oebuild_config.docker if yocto_repo.active_branch.name in docker_config.tag_map: - return docker_config.tag_map[yocto_repo.active_branch.name] + return str(docker_config.tag_map[yocto_repo.active_branch.name]) return None diff --git a/src/oebuild/ogit.py b/src/oebuild/ogit.py index 92f1466f5b2da0beb2208220fa8394e53ba4c696..32f671256f746cd9cc000f9f530164c8a9930296 100644 --- a/src/oebuild/ogit.py +++ b/src/oebuild/ogit.py @@ -57,16 +57,15 @@ class OGit: ''' check out version ''' - repo = Repo.init(self._repo_dir) - try: - repo.git.checkout(version) - except GitCommandError: - logger.error("checkout faild") + self._fetch_upstream(version=version) - def clone_or_pull_repo(self,): + def clone_or_pull_repo(self): ''' clone or pull git repo ''' + self._fetch_upstream() + + def _fetch_upstream(self, version=None): repo = Repo.init(self._repo_dir) remote = None for item in repo.remotes: @@ -80,7 +79,10 @@ class OGit: logger.info("Fetching into %s ...", self._repo_dir) remote.fetch(progress=CustomRemote()) try: - repo.git.checkout(self._branch) + if version is None: + repo.git.checkout(self._branch) + else: + repo.git.checkout(version) except GitCommandError: logger.error("update faild") diff --git a/src/oebuild/version.py b/src/oebuild/version.py index b05f40a938d03e73a745ca47e41ea43885b6725f..88dcd267f70a6e839c5cdbfeb88f36c0fd52b900 100644 --- a/src/oebuild/version.py +++ b/src/oebuild/version.py @@ -10,4 +10,4 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. ''' -__version__ = '0.0.31' +__version__ = '0.0.32'