diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-11-20 17:53:46 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-11-20 18:07:22 +0100 |
| commit | 4aa178022def247834f7ecfc45b5defbe9270d09 (patch) | |
| tree | 8097312404aeb6e2816da0a95290bc1be6f70f8e | |
| parent | d616dd152f1e30a58db176826d8c5d05612ef5e9 (diff) | |
GitRepository: Return GitModifier from get_author_info
| -rwxr-xr-x | examples/gbp-add-patch | 4 | ||||
| -rw-r--r-- | gbp/git/__init__.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/gbp-add-patch b/examples/gbp-add-patch index 8a10eb5..059ac9c 100755 --- a/examples/gbp-add-patch +++ b/examples/gbp-add-patch @@ -94,8 +94,8 @@ def build_commit_msg(repo, patch, options): thanks = '' closes = '' - author, dummy = repo.get_author_info() - if author != patch.author_name(): + author = repo.get_author_info() + if author.name != patch.author_name(): thanks = "Thanks: %s" % patch.author_name() for line in patch.body.split('\n'): diff --git a/gbp/git/__init__.py b/gbp/git/__init__.py index 775da63..b1e419c 100644 --- a/gbp/git/__init__.py +++ b/gbp/git/__init__.py @@ -623,7 +623,7 @@ class GitRepository(object): config and environment variables. @return: name and email - @rtype: C{tuple} + @rtype: L{GitModifier} """ try: name = self.get_config("user.email") @@ -635,7 +635,7 @@ class GitRepository(object): email = os.getenv("EMAIL") email = os.getenv("GIT_AUTHOR_EMAIL", email) name = os.getenv("GIT_AUTHOR_NAME", name) - return (name, email) + return GitModifier(name, email) #{ Remote Repositories |