diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-04-02 03:17:48 -0400 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-04-02 03:17:48 -0400 |
| commit | 47e9e98d6fdecb9d08cb3020a78d427eb8c76773 (patch) | |
| tree | 064e3620873d4dfb86e2eca513ac1157d6ff1aa2 | |
| parent | 05219b89b367b077a1e1f61a2767e71f7f44665a (diff) | |
| download | oslo-47e9e98d6fdecb9d08cb3020a78d427eb8c76773.tar.gz oslo-47e9e98d6fdecb9d08cb3020a78d427eb8c76773.tar.xz oslo-47e9e98d6fdecb9d08cb3020a78d427eb8c76773.zip | |
Fix the co-authored-by processing.
One of the problems with fakes is that sometimes you can fake away
a bug and have happily passing tests and broken code.
Change-Id: Ib544739699b63d3f5e80edc16e19377d45782334
| -rw-r--r-- | openstack/common/setup.py | 4 | ||||
| -rw-r--r-- | tests/unit/test_setup.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py index dec74fd..ba6b54a 100644 --- a/openstack/common/setup.py +++ b/openstack/common/setup.py @@ -171,8 +171,8 @@ def generate_authors(): " log --format='%aN <%aE>' | sort -u | " "egrep -v '" + jenkins_email + "'") changelog = _run_shell_command(git_log_cmd) - signed_cmd = ("git log --git-dir=" + git_dir + - " | grep -i Co-authored-by: | sort -u") + signed_cmd = ("git --git-dir=" + git_dir + + " log | grep -i Co-authored-by: | sort -u") signed_entries = _run_shell_command(signed_cmd) if signed_entries: new_entries = "\n".join( diff --git a/tests/unit/test_setup.py b/tests/unit/test_setup.py index ae19c98..c032592 100644 --- a/tests/unit/test_setup.py +++ b/tests/unit/test_setup.py @@ -138,7 +138,7 @@ class GitLogsTest(utils.BaseTestCase): git_log_cmd = ("git --git-dir=%s log --format" % os.path.join(root_dir, '.git')) - git_co_log_cmd = ("git log --git-dir=%s" % + git_co_log_cmd = ("git --git-dir=%s log" % os.path.join(root_dir, '.git')) cmd_map = { git_log_cmd: author_new, |