billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add secretgpgkeyfixer.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-24 20:36:49 +00:00
parent 5decae132c
commit 65036278c0
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ognibuild/dist.py
View file

@ -28,7 +28,7 @@ import os
import shutil import shutil
import sys import sys
import time import time
from typing import Optional from typing import Optional, List
from debian.deb822 import Deb822 from debian.deb822 import Deb822
@ -152,7 +152,8 @@ def create_dist(
) -> Optional[str]: ) -> Optional[str]:
from .buildsystem import detect_buildsystems from .buildsystem import detect_buildsystems
from .buildlog import InstallFixer from .buildlog import InstallFixer
from .fixers import GitIdentityFixer from .fix_build import BuildFixer
from .fixers import GitIdentityFixer, SecretGpgKeyFixer
if subdir is None: if subdir is None:
subdir = "package" subdir = "package"
@ -167,7 +168,12 @@ def create_dist(
# TODO(jelmer): use scan_buildsystems to also look in subdirectories # TODO(jelmer): use scan_buildsystems to also look in subdirectories
buildsystems = list(detect_buildsystems(export_directory)) buildsystems = list(detect_buildsystems(export_directory))
resolver = auto_resolver(session) resolver = auto_resolver(session)
fixers = [InstallFixer(resolver), GitIdentityFixer(session)] fixers: List[BuildFixer] = [InstallFixer(resolver)]
if session.is_temporary:
# Only muck about with temporary sessions
fixers.extend([
GitIdentityFixer(session), SecretGpgKeyFixer(session)])
with DistCatcher(export_directory) as dc: with DistCatcher(export_directory) as dc:
session.chdir(reldir) session.chdir(reldir)