Skip to content

Commit ee38221

Browse files
authored
GH-54595: [Packaging][CI] Fix regex on update_deb_package_names to cover the 3 on libarrow_s3 (#54608)
### Rationale for this change Linux packaging jobs for Deb packages are currently failing due to wrong libarrow_s32600 still being referred to. ### What changes are included in this PR? Update regex to cover numbers on libarrowxxx package names. Update the wrong entries at control.in. ### Are these changes tested? I have tested the regex locally with: ``` $ sed -i.bak -E -e "s/(lib(arrow|gandiva|parquet)[-a-z0-9]*)2700/\\12800/g" dev/tasks/linux-packages/apache-arrow/debian/control.in ``` And validated the diff contains libarrow s3 updated: ```diff @@ -122,13 +122,13 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, - libarrow-acero2700 (= ${binary:Version}), - libparquet2700 (= ${binary:Version}) + libarrow-acero2800 (= ${binary:Version}), + libparquet2800 (= ${binary:Version}) Description: Apache Arrow is a data processing library for analysis . This package provides C++ library files for Dataset module. -Package: libarrow-s3-2700 +Package: libarrow-s3-2800 Section: libs Architecture: any Multi-Arch: same ``` ### Are there any user-facing changes? No ### Was AI used for this PR? In accordance to the [AI generation guidelines](https://arrow.apache.org/docs/dev/developers/overview.html#ai-generated-code), please disclose below whether and how AI was used in this PR. **PR code and description written by:** - [x] Human - [ ] AI **Reviewed before submission by:** - [x] Human - [ ] AI - [ ] Not reviewed * GitHub Issue: #54595 Authored-by: Raúl Cumplido <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 61f24ce commit ee38221

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎dev/release/utils-prepare.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ update_deb_package_names() {
216216
${target} \
217217
$(echo ${target} | sed -e "s/${deb_lib_suffix}/${next_deb_lib_suffix}/")
218218
done
219-
local deb_lib_suffix_substitute_pattern="s/(lib(arrow|gandiva|parquet)[-a-z]*)${deb_lib_suffix}/\\1${next_deb_lib_suffix}/g"
219+
local deb_lib_suffix_substitute_pattern="s/(lib(arrow|gandiva|parquet)[-a-z0-9]*)${deb_lib_suffix}/\\1${next_deb_lib_suffix}/g"
220220
sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" debian*/control*
221221
rm -f debian*/control*.bak
222222
git add debian*/control*
@@ -233,7 +233,7 @@ update_deb_package_names() {
233233
${target} \
234234
$(echo ${target} | sed -e "s/${deb_gir_suffix}/${next_deb_gir_suffix}/")
235235
done
236-
local deb_gir_suffix_substitute_pattern="s/(gir1\\.2-(arrow|gandiva|parquet)[-a-z]*)${deb_gir_suffix}/\\1${next_deb_gir_suffix}/g"
236+
local deb_gir_suffix_substitute_pattern="s/(gir1\\.2-(arrow|gandiva|parquet)[-a-z0-9]*)${deb_gir_suffix}/\\1${next_deb_gir_suffix}/g"
237237
sed -i.bak -E -e "${deb_gir_suffix_substitute_pattern}" debian*/control*
238238
rm -f debian*/control*.bak
239239
git add debian*/control*

‎dev/tasks/linux-packages/apache-arrow/debian/control.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Description: Apache Arrow is a data processing library for analysis
128128
.
129129
This package provides C++ library files for Dataset module.
130130

131-
Package: libarrow-s3-2600
131+
Package: libarrow-s3-2700
132132
Section: libs
133133
Architecture: any
134134
Multi-Arch: same
@@ -257,7 +257,7 @@ Architecture: any
257257
Multi-Arch: same
258258
Depends:
259259
${misc:Depends},
260-
libarrow-s3-2600 (= ${binary:Version}),
260+
libarrow-s3-2700 (= ${binary:Version}),
261261
libarrow-dev (= ${binary:Version})
262262
Description: Apache Arrow is a data processing library for analysis
263263
.

0 commit comments

Comments
 (0)