From 2d8623651e709d46a3a00d17c4d08a0957a9b325 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 11 Aug 2018 20:22:03 +0300
Subject: Change: set DEBFULLNAME and DEBMAIL for debian/changelog changes

---
 ick_helpers.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/ick_helpers.py b/ick_helpers.py
index 9d64e62..f5fd643 100644
--- a/ick_helpers.py
+++ b/ick_helpers.py
@@ -135,9 +135,11 @@ class Version:
 
 class DebianReleaseBuilder:
 
-    def __init__(self, ex, resultsdir):
+    def __init__(self, ex, resultsdir, debfullname, debemail):
         self.ex = ex
         self.results = resultsdir
+        self.debfullname = debfullname
+        self.debemail = debemail
 
     def build(self, tag, distribution):
         cwd = os.getcwd()
@@ -204,13 +206,16 @@ class DebianReleaseBuilder:
         return output.strip()
 
     def set_distribution(self, version, distribution):
+        env = dict(os.environ)
+        env['DEBFULLNAME'] = self.debfullname
+        env['DEBEMAIL'] = self.debemail
         newver = '{}.{}'.format(version.full, distribution)
         debug('newver:', newver)
         msg = 'Build release for {} in CI.'.format(distribution)
         self.ex.run(
-            'dch', '-v', newver, '-D', distribution, '--force-distribution',
-            msg)
-        self.ex.run('dch', '-r', '')
+            'dch', '--no-conf', '-v', newver, '-D', distribution,
+            '--force-distribution', msg, env=env)
+        self.ex.run('dch', '--no-conf', '-r', '', env=env)
 
     def create_dsc(self):
         self.ex.run('dpkg-buildpackage', '-S', '--no-sign')
@@ -265,7 +270,11 @@ def find_upstream_dirs(sources):
             yield dirname
 
 
-def build_debian_releases(sources, distribution, resultsdir):
+def build_debian_releases(params, resultsdir):
+    sources = params['sources']
+    distribution = params['distribution']
+    debfullname = params['DEBFULLNAME']
+    debemail = params['DEBEMAIL']
     known = KnownTags()
     first_build = known.is_empty()
     dirnames = find_upstream_dirs(sources)
@@ -274,7 +283,7 @@ def build_debian_releases(sources, distribution, resultsdir):
         project = ex.get_debian_source_package()
         tags = ex.find_release_tags(project)
         debug('release tags:', tags)
-        builder = DebianReleaseBuilder(ex, resultsdir)
+        builder = DebianReleaseBuilder(ex, resultsdir, debfullname, debemail)
         for tag in tags:
             if first_build:
                 debug('First build, not building', tag, 'for', distribution)
-- 
cgit v1.2.1