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

Add verbose option.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-21 22:50:19 +00:00
parent 3e4550a0a6
commit 42724a74a8
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ognibuild/debian/fix_build.py
View file

@ -180,7 +180,7 @@ class AutopkgtestDependencyContext(DependencyContext):
def add_dependency(self, requirement): def add_dependency(self, requirement):
return add_test_dependency( return add_test_dependency(
self.tree, self.tree,
self.testname, self.phase[1],
requirement, requirement,
committer=self.committer, committer=self.committer,
subpath=self.subpath, subpath=self.subpath,
@ -510,6 +510,7 @@ class PgBuildExtOutOfDateControlFixer(BuildFixer):
def _fix(self, error, context): def _fix(self, error, context):
logging.info("Running 'pg_buildext updatecontrol'") logging.info("Running 'pg_buildext updatecontrol'")
self.session.check_call(["pg_buildext", "updatecontrol"]) self.session.check_call(["pg_buildext", "updatecontrol"])
# TODO(jelmer): Copy control file back
return commit_debian_changes( return commit_debian_changes(
context.tree, context.tree,
context.subpath, context.subpath,
@ -655,10 +656,12 @@ def build_incrementally(
os.path.join(output_directory, "build.log.%d" % i) os.path.join(output_directory, "build.log.%d" % i)
): ):
i += 1 i += 1
target_path = os.path.join(output_directory, "build.log.%d" % i)
os.rename( os.rename(
os.path.join(output_directory, "build.log"), os.path.join(output_directory, "build.log"),
os.path.join(output_directory, "build.log.%d" % i), target_path
) )
logging.debug('Storing build log at %s', target_path)
def main(argv=None): def main(argv=None):
@ -701,6 +704,10 @@ def main(argv=None):
'--schroot', '--schroot',
type=str, type=str,
help='chroot to use.') help='chroot to use.')
parser.add_argument(
'--verbose',
action='store_true',
help='Be verbose')
args = parser.parse_args() args = parser.parse_args()
from breezy.workingtree import WorkingTree from breezy.workingtree import WorkingTree
@ -710,7 +717,10 @@ def main(argv=None):
import tempfile import tempfile
import contextlib import contextlib
logging.basicConfig(level=logging.INFO, format="%(message)s") if args.verbose:
logging.basicConfig(level=logging.DEBUG, format="%(message)s")
else:
logging.basicConfig(level=logging.INFO, format="%(message)s")
with contextlib.ExitStack() as es: with contextlib.ExitStack() as es:
if args.output_directory is None: if args.output_directory is None: