diff options
| author | merakor <cem@ckyln.com> | 2021-08-04 18:59:01 +0000 |
|---|---|---|
| committer | merakor <cem@ckyln.com> | 2021-08-04 18:59:01 +0000 |
| commit | ec04b67fdf49ce2c419ed8ab067194e118910dd5 (patch) | |
| tree | f12e81b1619e1b56508c59f4f76002ad9fc8c9cf | |
| parent | d849c5a56f3b39c70335f5df5ef4af25f4b814a9 (diff) | |
| parent | 35e056e3765b7a82307b21dd86c1e076453710f4 (diff) | |
| download | cpt-ec04b67fdf49ce2c419ed8ab067194e118910dd5.tar.gz | |
merge maintenance branch
FossilOrigin-Name: a443a3c456874b29c7a449582f07ff49cae3c2f2bef2a4df12f36b6a02a624f8
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | src/cpt-lib.in | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cea9449..5719efd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,14 @@ etcsums are also backwards compatible. - Installation now requires to run `./configure`. +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 -------------------------------------------------------------------------------- diff --git a/src/cpt-lib.in b/src/cpt-lib.in index a53d708..c055331 100644 --- a/src/cpt-lib.in +++ b/src/cpt-lib.in @@ -987,7 +987,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() ( |