diff --git a/common/log_obs.py b/common/log_obs.py index b493ee872b95b0cc2b6f8b0007383ed80ad0629f..831ac157f7857b969acc73e81b4ce99c935a51cb 100644 --- a/common/log_obs.py +++ b/common/log_obs.py @@ -26,7 +26,8 @@ def get_logger(): get logger object return: logger object """ - log_path = os.path.join(os.path.split(os.path.realpath(__file__))[0], "../log") + #log_path = os.path.join(os.path.split(os.path.realpath(__file__))[0], "../log") + log_path = "log" if not os.path.exists(log_path): os.mkdir(log_path) elif not os.path.isdir(log_path): diff --git a/common/parser_config.py b/common/parser_config.py index 590aa97cac981c77d5b83081242e4bacea626f22..c47a67a7b311050adb215631b9df892d318aea19 100644 --- a/common/parser_config.py +++ b/common/parser_config.py @@ -52,9 +52,7 @@ class ParserConfigIni(object): """ self.update_enabled_flag = {} self.branch_proj = {} - config_path = os.path.join( - os.path.split(os.path.realpath(__file__))[0], - "../config/config.ini") + config_path = "config/config.ini" self.config = ConfParser() #self.config = configparser.ConfigParser() self.config.read(config_path, encoding='utf-8') diff --git a/core/project_manager.py b/core/project_manager.py index be0cce92cda317342cc7aa376ab176d95a42fd19..a00a22314b68407a887ffae39d61dc11b9e9f447 100644 --- a/core/project_manager.py +++ b/core/project_manager.py @@ -36,9 +36,6 @@ class OBSPrjManager(object): init project base info obs_meta_path: path of obs_meta repository """ - if not obs_meta: - log.error("can not found obs_meta") - exit(0) self.obs_meta = obs_meta os.chdir(self.obs_meta) self.commit_msg = [] diff --git a/core/runner.py b/core/runner.py index 2e68636e8a7d7ad5153abadb4c4b491afc605ee2..01dad8ed731bf008aca57a8d4af1fcffd4ff9e61 100644 --- a/core/runner.py +++ b/core/runner.py @@ -46,10 +46,13 @@ class Runner(object): return: """ log.debug("obs_meta change") - obs_prjm = OBSPrjManager(self.kwargs["obs_meta_path"]) - obs_prjm.manager_action() - obs_pkgm = OBSPkgManager(**self.kwargs) - obs_pkgm.obs_pkg_admc() + if not self.kwargs["obs_meta_path"]: + log.error("can not find obs_meta path") + else: + obs_prjm = OBSPrjManager(self.kwargs["obs_meta_path"]) + obs_prjm.manager_action() + obs_pkgm = OBSPkgManager(**self.kwargs) + obs_pkgm.obs_pkg_admc() def _save_package_info(self): """