aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitrij Tejblum <tejblum@yandex-team.ru>2015-02-08 13:23:55 +0300
committerGuido G√ľnther <agx@sigxcpu.org>2015-02-17 19:11:53 +0100
commit296796f5f2dd00079c0c85d34882074abff07f5e (patch)
tree67eba889ae2638581ec7f0ea74b688e16c30a20d
parent0881bfc1314fe195a8391e60ceabb8faf0c68b9f (diff)
git-dch --git-author: separate author and emaildebian/experimental
Allow --git-author to work if either author or email is not specified in the git config, taking the other config option into account.
-rw-r--r--gbp/deb/changelog.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/gbp/deb/changelog.py b/gbp/deb/changelog.py
index 356f74d..b3c56ef 100644
--- a/gbp/deb/changelog.py
+++ b/gbp/deb/changelog.py
@@ -245,8 +245,10 @@ class ChangeLog(object):
args.extend(["--release", "--no-force-save-on-release"])
msg = None
- if author and email:
- env = {'DEBFULLNAME': author, 'DEBEMAIL': email}
+ if author:
+ env['DEBFULLNAME'] = author
+ if email:
+ env['DEBEMAIL'] = email
if distribution:
args.append("--distribution=%s" % distribution)