[projects/pld-ftp-admin] Fix duplicate package detection and validation in main and ready

[baggins]

commit ab2e3122cb54a9eac98e8814a60c10b585a6441a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Sep 16 09:41:23 2025 +0000

    Fix duplicate package detection and validation in main and ready

 wwwbin/consistency-check.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/wwwbin/consistency-check.sh b/wwwbin/consistency-check.sh
index 44faec7..5716371 100755
--- a/wwwbin/consistency-check.sh
+++ b/wwwbin/consistency-check.sh
@@ -35,7 +35,7 @@ pkg2src() {
 	# create list of N-V-R.A.rpm -> src-N pairs from error report
 	# error: arcconf-7.0.18786-1: req libstdc++.so.5()(64bit) not found
 	sed -ne 's/error: \(.*\): req .* not found/\1/p' $t | sort -u | \
-		xargs -d '\n' poldek --noignore -Q "$@" --cmd ls -q -s | \
+		xargs -d '\n' poldek --noignore -O "auto directory dependencies = yes" -O "unique package names = no" "$@" --cmd ls -q -s | \
 		sed -rne "s/^([^\t ]+)[\t ]+(.+)-[^-]+-[^-]+\.src\.rpm$/\1\t\2/p" >$t3
 
 	local pkg error message srpm
@@ -58,6 +58,7 @@ gen_list() {
 	poldek --cleana
 	poldek \
 	 -O "auto directory dependencies = yes" \
+	 -O "unique package names = no" \
 	--ignore "*-debuginfo-*" \
 	--ignore "*-debugsource-*" \
 	--ignore "opera-plugin32-*" \
@@ -75,13 +76,13 @@ gen_list() {
 	--ignore "openjdk10-*" \
 	--ignore "java-gnu-classpath-*" \
 	--ignore "libxcrypt-compat-*" \
-	--verify=deps -Q "$@" | filter_deps $arch | group_deps | pkg2src "$@" | sort
+	--verify=deps "$@" | filter_deps $arch | group_deps | pkg2src "$@" | sort
 }
 
 gen_list_uniq() {
 	arch=$1
 	shift
-	gen_list $arch -O "unique package names = yes" "$@"
+	gen_list $arch -Q -O "unique package names = yes" "$@"
 }
 
 t=$(mktemp)
@@ -93,7 +94,7 @@ for arch in x86_64 i686 x32 ; do
 		outfext=-$arch.txt
 	fi
 	gen_list      $arch -s $ftpdir/PLD/$arch/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ > $t && cat $t > $HOME/www/main$outfext
-	gen_list_uniq $arch -s $ftpdir/PLD/$arch/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/$arch/RPMS/ -s $ftpdir/ready/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready$outfext
+	gen_list      $arch -s $ftpdir/PLD/$arch/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/$arch/RPMS/ -s $ftpdir/ready/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready$outfext
 	gen_list_uniq $arch -s $ftpdir/PLD/$arch/RPMS/ -s $ftpdir/PLD/noarch/RPMS/ -s $ftpdir/ready/$arch/RPMS/ -s $ftpdir/ready/noarch/RPMS/ -s $ftpdir/test/$arch/RPMS/ -s $ftpdir/test/noarch/RPMS/ > $t && cat $t > $HOME/www/main-ready-test$outfext
 done
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-ftp-admin.git/commitdiff/ab2e3122cb54a9eac98e8814a60c10b585a6441a