From 26173e692e6aef207a1d65e84cc07c280d8d1537 Mon Sep 17 00:00:00 2001 From: hbai Date: Tue, 24 Nov 2020 11:51:08 +0800 Subject: [PATCH] Fix ERROR(1419) Bad path '#cert-manager-helm' in file 'centos_pkg_dirs' Comment lines begin with '#' in 'centos_pkg_dirs' are not ignored by scripts build-srpms-parallel and build-srpms-serial Closes-Bug: 1905350 Signed-off-by: Davlet Panech Signed-off-by: hbai Change-Id: I93affc9d064bad0107f73a136271fb2c7b73c738 --- build-tools/build-srpms-parallel | 2 +- build-tools/build-srpms-serial | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/build-srpms-parallel b/build-tools/build-srpms-parallel index a4235080..5d7b6282 100755 --- a/build-tools/build-srpms-parallel +++ b/build-tools/build-srpms-parallel @@ -1374,7 +1374,7 @@ for GIT_ROOT in $GIT_LIST; do continue fi - for p in $(cat $GIT_ROOT/$PKG_DIRS_FILE 2>> /dev/null); do + for p in $(sed 's/#.*//' $GIT_ROOT/$PKG_DIRS_FILE 2>> /dev/null); do if [ $STOP_SCHEDULING -eq 1 ]; then break; fi diff --git a/build-tools/build-srpms-serial b/build-tools/build-srpms-serial index 7416900e..e83ac519 100755 --- a/build-tools/build-srpms-serial +++ b/build-tools/build-srpms-serial @@ -1238,7 +1238,7 @@ for GIT_ROOT in $GIT_LIST; do continue fi - for p in $(cat $GIT_ROOT/$PKG_DIRS_FILE 2>> /dev/null); do + for p in $(sed 's/#.*//' $GIT_ROOT/$PKG_DIRS_FILE 2>> /dev/null); do src_dir="$GIT_ROOT/$p" if [ -d $src_dir ]; then if [ -d $src_dir/${DISTRO} ]; then