From 6dd373e65fc4aa51855c5d17776a9cd80bd02f5d Mon Sep 17 00:00:00 2001 From: hyokeun Date: Tue, 6 Feb 2018 11:35:37 +0900 Subject: [PATCH] Fix name conflict from parent class Change-Id: I907f2326dac97415159404c7f052eca8ab9d7ab3 --- common/git.py | 2 +- job_update_local_git.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/git.py b/common/git.py index 3f780f5..edbf147 100644 --- a/common/git.py +++ b/common/git.py @@ -187,7 +187,7 @@ class Git(GitRepository): args = GitArgs(remote, ':' + tag) self._git_command("push", args.args) - def get_commit_info(self, commitid): + def get_commit_info_from_id(self, commitid): data = {"commit_id": None, \ "committer": None, \ "commit_date": None, \ diff --git a/job_update_local_git.py b/job_update_local_git.py index 0ef367a..134a245 100755 --- a/job_update_local_git.py +++ b/job_update_local_git.py @@ -60,7 +60,7 @@ def update_dashboard(full_git_path): ## Tag and Commit have the same commit info if is_ref_deleted != True: - ret_data = mygit.get_commit_info(reference) + ret_data = mygit.get_commit_info_from_id(reference) commit_id = ret_data["commit_id"] committer = ret_data["committer"] commit_date = ret_data["commit_date"] -- 2.7.4