Verified Commit 4d5f1d5a authored by Baptiste Beauplat's avatar Baptiste Beauplat
Browse files

Fix unsigned build from test source packages

parent 9cbcc108
...@@ -155,7 +155,7 @@ class TestImporterController(TestController): ...@@ -155,7 +155,7 @@ class TestImporterController(TestController):
skip_email=False, base_dir=None, sub_dir=None): skip_email=False, base_dir=None, sub_dir=None):
source_package = TestSourcePackage(package_dir, base_dir) source_package = TestSourcePackage(package_dir, base_dir)
source_package.build() source_package.build(not skip_gpg)
self._run_importer(source_package.get_package_dir(), skip_gpg=skip_gpg, self._run_importer(source_package.get_package_dir(), skip_gpg=skip_gpg,
skip_email=skip_email, sub_dir=sub_dir) skip_email=skip_email, sub_dir=sub_dir)
......
...@@ -130,13 +130,17 @@ BQJb8YGqAhsMAAoJEMQ0eBzocfPf8IcA/RyHF6zgRu2Ds3wH8GgxjCZRW+YxWahX ...@@ -130,13 +130,17 @@ BQJb8YGqAhsMAAoJEMQ0eBzocfPf8IcA/RyHF6zgRu2Ds3wH8GgxjCZRW+YxWahX
self._run_command(command, args, self.source_dir, self._run_command(command, args, self.source_dir,
self._get_env_with_gpg()) self._get_env_with_gpg())
def _build_package(self): def _build_package(self, sign):
args = ['--build=source', args = ['--build=source',
'--no-check-builddeps', '--no-check-builddeps',
'--sign-key=559306EEE1C8C1B2DD1C73B1C434781CE871F3DF', '--sign-key=559306EEE1C8C1B2DD1C73B1C434781CE871F3DF']
'--force-sign']
command = 'dpkg-buildpackage' command = 'dpkg-buildpackage'
if sign:
args.append('--force-sign')
else:
args.append('--no-sign')
log.debug('Build source package {}-{}'.format(self.package, log.debug('Build source package {}-{}'.format(self.package,
self.version)) self.version))
self._run_command(command, args, join(self.workdir, 'sources'), self._run_command(command, args, join(self.workdir, 'sources'),
...@@ -180,14 +184,14 @@ BQJb8YGqAhsMAAoJEMQ0eBzocfPf8IcA/RyHF6zgRu2Ds3wH8GgxjCZRW+YxWahX ...@@ -180,14 +184,14 @@ BQJb8YGqAhsMAAoJEMQ0eBzocfPf8IcA/RyHF6zgRu2Ds3wH8GgxjCZRW+YxWahX
def get_package_dir(self): def get_package_dir(self):
return self.workdir return self.workdir
def build(self): def build(self, sign=True):
# Copy sources files into workdir # Copy sources files into workdir
copytree(self.source_dir, copytree(self.source_dir,
join(self.workdir, 'sources')) join(self.workdir, 'sources'))
# Gen orig, build and sign # Gen orig, build and sign
self._gen_orig() self._gen_orig()
self._build_package() self._build_package(sign)
# Remove temporary source dir # Remove temporary source dir
if isdir(join(self.workdir, 'sources')): if isdir(join(self.workdir, 'sources')):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment