From fc90100bc9b899c5317cf2d8484ad935426a7d5e Mon Sep 17 00:00:00 2001 From: hbai Date: Thu, 31 Mar 2022 20:26:13 +0800 Subject: [PATCH] build-pkgs: Make dsc_depend take back the failed dsc The build failed dsc should be taken back by dsc_depend for next apply. Test Plan: Pass: run build-pkgs -c -a Blow log message should not be printed: "INFO: Previous package still in building stage..." Story: 2008846 Task: 44899 Signed-off-by: hbai Change-Id: I1da69a0e18b1ac586a84b78193912ac6329aa58e --- build-tools/stx/build-pkgs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build-tools/stx/build-pkgs b/build-tools/stx/build-pkgs index 97dfbbad..b5cc109d 100755 --- a/build-tools/stx/build-pkgs +++ b/build-tools/stx/build-pkgs @@ -582,6 +582,9 @@ class BuildController(): for p in range(len(pkgs_dsc)): pkgs_can_build = deps_resolver.get_build_able_pkg(1) + if not pkgs_can_build: + logger.warning("Depends resolver returns none") + return for dsc_path in pkgs_can_build: logger.info(' '.join(['Depends resolver tells to build', os.path.basename(dsc_path)])) @@ -598,6 +601,7 @@ class BuildController(): else: logger.info(' '.join(['Failed to build', pkg_name, str(p)])) self.lists['fail'].append(pkg_dir) + deps_resolver.pkg_fail(dsc_path) self.req_stop_task() if self.attrs['exit_on_fail']: return @@ -807,7 +811,7 @@ class BuildController(): # particularly refer to those failed packages reported by pkgbuilder if len(self.lists['fail']) > 0: logger.info("List of failed packages:") - for pkg_dir in sorted(self.lists['fail']): + for pkg_dir in sorted(list(set(self.lists['fail']))): pkg_name = discovery.package_dir_to_package_name(pkg_dir, self.attrs['distro']) logger.error(pkg_name) logger.info("For the failure reason, you can check with:")