From 9438b7facd2634dca2f776480e25645ab043b4fe Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 22 Mar 2024 19:00:03 +0900 Subject: [PATCH] apt: changed to match fluent-lts-apt-source correctly (#633) In the previous versions, there is a case that fluent-apt-source and fluentd-apt-source packages were moved under f/fluent-lts-apt-source This PR fixes to add restriction rule for lts package name. Signed-off-by: Kentaro Hayashi --- fluent-package/convert-artifacts-layout.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fluent-package/convert-artifacts-layout.sh b/fluent-package/convert-artifacts-layout.sh index 526dbf468..2c2f613f0 100755 --- a/fluent-package/convert-artifacts-layout.sh +++ b/fluent-package/convert-artifacts-layout.sh @@ -39,7 +39,7 @@ case $1 in -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package \; if [ "$2" = "lts" ]; then mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-lts-apt-source - find $REPOSITORY_PATH/debian/pool/$d -name 'fluent*-apt-source*.deb' -not -name '*dbgsym*' \ + find $REPOSITORY_PATH/debian/pool/$d -name 'fluent-lts-apt-source*.deb' -not -name '*dbgsym*' \ -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-lts-apt-source \; else mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-apt-source @@ -57,7 +57,7 @@ case $1 in -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package \; if [ "$2" = "lts" ]; then mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-lts-apt-source - find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent*-apt-source*.deb' \ + find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent-lts-apt-source*.deb' \ -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-lts-apt-source \; else mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-apt-source