diff --git a/NEWS b/NEWS index 5c3958453541c6dc2405e88a554c32c0f0b5cc09..499c48ffb1dd8af3e9ecf3cd4a7963bee26d5e42 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +CHANGES with 11.2: + +- make duplicate and upper package detection remove tab chars ('\t') before sorting + CHANGES with 11.1: - Include NEWS from version 10 to 11 diff --git a/aports-lint b/aports-lint index 59df1a5b45f210a55f9a2beac8de30a7ec191d75..f040a6e5ec4506f8cf769261edf1b004c8229200 100755 --- a/aports-lint +++ b/aports-lint @@ -65,7 +65,7 @@ find_dupe() { upper_repo_depends() { [ "$SKIP_UPPER_REPO_DEPENDS" ] && return 0 - printf "%s\n" "$depends" | tr " " "\n" | sort -u | while read -r pkg; do + printf "%s\n" "$depends" | tr " " "\n" | tr -d "\t" | sort -u | while read -r pkg; do for p in $(find_repo "$pkg" "$_repo"); do printf "$apkbuild:: depends '$pkg' is in upper repo '$p'\n" done @@ -74,7 +74,7 @@ upper_repo_depends() { duplicate_depends() { [ "$SKIP_DUPLICATE_DEPENDS" ] && return 0 - printf "%s\n" "$depends" | tr " " "\n" | sort | uniq -d | while read -r dup; do + printf "%s\n" "$depends" | tr " " "\n" | tr -d "\t" | sort | uniq -d | while read -r dup; do [ -z "$dup" ] && continue printf "$apkbuild:: duplicate '$dup' in depends\n" done @@ -82,7 +82,7 @@ duplicate_depends() { upper_repo_makedepends() { [ "$SKIP_UPPER_REPO_MAKEDEPENDS" ] && return 0 - printf "%s\n" "$makedepends" | tr " " "\n" | sort -u | while read -r pkg; do + printf "%s\n" "$makedepends" | tr " " "\n" | tr -d "\t" | sort -u | while read -r pkg; do for p in $(find_repo "$pkg" "$_repo"); do printf "$apkbuild:: makedepends '$pkg' is in upper repo '$p'\n" done @@ -91,7 +91,7 @@ upper_repo_makedepends() { duplicate_makedepends() { [ "$SKIP_DUPLICATE_MAKEDEPENDS" ] && return 0 - printf "%s\n" "$makedepends" | tr " " "\n" | sort | uniq -d | while read -r dup; do + printf "%s\n" "$makedepends" | tr " " "\n" | tr -d "\t" | sort | uniq -d | while read -r dup; do [ -z "$dup" ] && continue printf "$apkbuild:: duplicate '$dup' in makedepends\n" done @@ -99,7 +99,7 @@ duplicate_makedepends() { upper_repo_checkdepends() { [ "$SKIP_UPPER_REPO_CHECKDEPENDS" ] && return 0 - printf "%s\n" "$checkdepends" | tr " " "\n" | sort -u | while read -r pkg; do + printf "%s\n" "$checkdepends" | tr " " "\n" | tr -d "\t" | sort -u | while read -r pkg; do for p in $(find_repo "$pkg" "$_repo"); do printf "$apkbuild:: checkdepends '$pkg' is in upper repo '$p'\n" done @@ -108,7 +108,7 @@ upper_repo_checkdepends() { duplicate_checkdepends() { [ "$SKIP_DUPLICATE_CHECKDEPENDS" ] && return 0 - printf "%s\n" "$checkdepends" | tr " " "\n" | sort | uniq -d | while read -r dup; do + printf "%s\n" "$checkdepends" | tr " " "\n" | tr -d "\t" | sort | uniq -d | while read -r dup; do [ -z "$dup" ] && continue printf "$apkbuild:: duplicate '$dup' in checkdepends\n" done @@ -139,8 +139,8 @@ pkgname_dirname_mismatch() { depends_makedepends_checkdepends_overlap() { [ "$SKIP_DEPENDS_MAKEDEPENDS_CHECKDEPENDS_OVERLAP" ] && return 0 local _mkdeps _ckdeps d - _mkdeps="$(echo $makedepends | tr " " "\\n" | sort -u)" - _ckdeps="$(echo $checkdepends | tr " " "\\n" | sort -u)" + _mkdeps="$(echo $makedepends | tr " " "\\n" | tr -d "\t" | sort -u)" + _ckdeps="$(echo $checkdepends | tr " " "\\n" | tr -d "\t" | sort -u)" [ -z "$_mkdeps" ] && [ -z "$_ckdeps" ] && return 0 for d in $depends; do if printf "%s\\n" "$_mkdeps" | grep -q "^$d$"; then