From c4c43142eaff0a969794a04bd30ddc08fb67b164 Mon Sep 17 00:00:00 2001 From: merakor Date: Wed, 4 Aug 2021 18:49:31 +0000 Subject: fix rare find(1) bug during manifest generation FossilOrigin-Name: 02129b3f28d3456f8248741e5b2ac07162a5add293470ccf7792190102b2af4f --- src/cpt-lib.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpt-lib.in b/src/cpt-lib.in index 306c5bd..7514608 100644 --- a/src/cpt-lib.in +++ b/src/cpt-lib.in @@ -956,7 +956,7 @@ pkg_manifest() ( # sed: Remove the first character in each line (./dir -> /dir) and # remove all lines which only contain '.'. find . -type d -exec printf '%s/\n' {} + -o -print | - sort -r | sed '/^\.\/$/d;ss.ss' > "${2:-$pkg_dir}/$1/$pkg_db/$1/manifest" + sort -r | sed '/^\.$/d;/^\.\/$/d;ss.ss' > "${2:-$pkg_dir}/$1/$pkg_db/$1/manifest" ) pkg_etcsums() ( -- cgit v1.2.3 From c8f4be44d6a8169f7e99de7c403671692fa104df Mon Sep 17 00:00:00 2001 From: merakor Date: Wed, 4 Aug 2021 18:52:12 +0000 Subject: update CHANGELOG FossilOrigin-Name: e7c167a24f5c040c1e6261b576f2adeb0d3491a75d4eebf7de8e506ed433999c --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ea1041..7854cfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ this project _somewhat_ adheres to [Semantic Versioning]. [Semantic Versioning]: https://semver.org/spec/v2.0.0.html +6.1.1 - 2021-08-04 +-------------------------------------------------------------------------------- + +### Fixed +- Fixed a rare bug during manifest generation that caused an empty line inside + the package manifest. + + 6.1.0 - 2021-07-22 -------------------------------------------------------------------------------- -- cgit v1.2.3 From 35e056e3765b7a82307b21dd86c1e076453710f4 Mon Sep 17 00:00:00 2001 From: merakor Date: Wed, 4 Aug 2021 18:52:28 +0000 Subject: cpt: bump to 6.1.1 FossilOrigin-Name: d18b1ab994e2763e1615a4b028e23f450c6b883327aa3ce47b823110dd331709 --- config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mk b/config.mk index 5253f54..a165463 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # Carbs Packaging Tools -VERSION = 6.1.0 +VERSION = 6.1.1 # Installation paths PREFIX = /usr/local -- cgit v1.2.3