Skip to content

Commit

Permalink
apt: changed to match fluent-lts-apt-source correctly (fluent#633)
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
kenhys authored Mar 22, 2024
1 parent 635a454 commit 9438b7f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fluent-package/convert-artifacts-layout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 9438b7f

Please sign in to comment.