From f1daa386f94c9a8735ac69ee057601dcded8e8b8 Mon Sep 17 00:00:00 2001 From: wangchong1995924 <15229716099@163.com> Date: Fri, 25 Jun 2021 09:38:35 +0800 Subject: [PATCH] fix exit error --- core/package_manager.py | 4 ++-- core/sync_pckg_mgmt.py | 2 +- test/func.py | 2 +- tools/create_pckg_mgmt_yaml.py | 2 +- tools/modify_src_openeuler_yaml.py | 5 +++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/core/package_manager.py b/core/package_manager.py index 49a27c7..4d795cf 100755 --- a/core/package_manager.py +++ b/core/package_manager.py @@ -542,10 +542,10 @@ class OBSPkgManager(object): log.info("=====================================================") if same_pkg_dict or no_service_dict: log.info("Have some problems !!!") - exit(1) + sys.exit(1) else: log.info("Have no problems !!!") - exit(0) + sys.exit(0) def _check_yaml_meta_pkg(self, yaml_dict, meta_bp_dict, pkg_branch_dict): """ diff --git a/core/sync_pckg_mgmt.py b/core/sync_pckg_mgmt.py index 505d495..673a4d9 100644 --- a/core/sync_pckg_mgmt.py +++ b/core/sync_pckg_mgmt.py @@ -53,7 +53,7 @@ class SyncPckgMgmt(object): return change_file else: log.error("%s not exist!" % self.release_management_path) - exit(1) + sys.exit(1) def _get_yaml_file_msg(self, file_path): """ diff --git a/test/func.py b/test/func.py index 8084c42..7b787d8 100644 --- a/test/func.py +++ b/test/func.py @@ -78,7 +78,7 @@ class SetEnv(object): print("oscrc file bakup sucessfull") else: print("oscrc file backup failed") - exit(1) + sys.exit(1) cmd = "touch %s && echo '[general]\napiurl=%s\n[%s]\nuser=%s\npass=%s' > %s" % \ (self.oscrc, self.obs_info["url"], self.obs_info["url"], self.obs_info["user"], \ self.obs_info["passwd"], self.oscrc) diff --git a/tools/create_pckg_mgmt_yaml.py b/tools/create_pckg_mgmt_yaml.py index e398280..c0d6047 100644 --- a/tools/create_pckg_mgmt_yaml.py +++ b/tools/create_pckg_mgmt_yaml.py @@ -37,7 +37,7 @@ args.to_project.sort() if len(args.from_project) != len(args.to_project): print("length of list from_project and to_project not equal") - exit(1) + sys.exit(1) pckg_mgmt_yaml = os.path.join(os.getcwd(), "pckg-mgmt.yaml") pkgs_dict = {"packages": {"natural": [], "recycle": [], "delete": []}} diff --git a/tools/modify_src_openeuler_yaml.py b/tools/modify_src_openeuler_yaml.py index b333234..81a07b9 100644 --- a/tools/modify_src_openeuler_yaml.py +++ b/tools/modify_src_openeuler_yaml.py @@ -18,6 +18,7 @@ modify src-openeuler.yaml """ import os +import sys import yaml import shutil import argparse @@ -30,7 +31,7 @@ args = par.parse_args() if not os.path.exists(args.pckg_mgmt): print("The pckg_mgmt.yaml file is not exist!") - exit(1) + sys.exit(1) def git_clone(gitee_repo): repo_path = os.path.join(os.getcwd(), gitee_repo) @@ -40,7 +41,7 @@ def git_clone(gitee_repo): cmd = "git clone --depth 1 %s" % git_url if os.system(cmd) != 0: print("Git clone %s failed!" % gitee_repo) - exit(1) + sys.exit(1) def read_yaml(file_path): if os.path.exists(file_path): -- Gitee