GitRepository: Return GitModifier from get_author_info
authorGuido Günther <agx@sigxcpu.org>
Sun, 20 Nov 2011 16:53:46 +0000 (17:53 +0100)
committerGuido Günther <agx@sigxcpu.org>
Sun, 20 Nov 2011 17:07:22 +0000 (18:07 +0100)
examples/gbp-add-patch
gbp/git/__init__.py

index 8a10eb5..059ac9c 100755 (executable)
@@ -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'):
index 775da63..b1e419c 100644 (file)
@@ -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