PR#481: Temporarily remove `-C` from `dnf repoquery` - FedoraReview

FedoraReview

#481 Temporarily remove `-C` from `dnf repoquery`

Closed 2 years ago by thebeanogamer. Opened 2 years ago by thebeanogamer.

thebeanogamer/FedoraReview removecacheonly into master

Remove `-C` from `dnf repoquery`

Daniel Milnes • 2 years ago

7ba8bde

scripts/generic-excludearch.sh

file modified

+2 -2

		`@@ -16,7 +16,7 @@`
		`# Get spec file for a given package`
		`{`
		`if [ -z "${srpm_by_pkg[$1]}" ]; then`
		`- srpm=$( dnf repoquery -C --qf '%{SOURCERPM}' $1 )`
		`+ srpm=$( dnf repoquery --qf '%{SOURCERPM}' $1 )`
		`srpm="${srpm%-*}"`
		`srpm="${srpm%-*}"`
		`srpm_by_pkg[$1]="$srpm"`
		`@@ -45,7 +45,7 @@`
		`[ -f $dep.spec ] \|\| deps="$deps $dep"`
		`done`
		`[ -z "$deps" ] && return`
		`- deps=$(dnf repoquery -C --requires --resolve $deps)`
		`+ deps=$(dnf repoquery --requires --resolve $deps)`
		`for dep in $deps; do`
		`pkg=${dep%-*}`
		`pkg=${pkg%-*}`

src/FedoraReview/deps.py

file modified

+2 -2

		`@@ -251,7 +251,7 @@`
		`"-qn",`
		`"--enable-network",`
		`"shell",`
		`- "dnf repoquery -C --quiet --file " + path,`
		`+ "dnf repoquery --quiet --file " + path,`
		`]`
		`Settings.get_logger().debug("Running: %s", " ".join(cmd))`
		`try:`
		`@@ -283,7 +283,7 @@`
		`"-qn",`
		`"--enable-network",`
		`"shell",`
		`- "dnf repoquery -C -l " + " ".join(list(set(pkgs))),`
		`+ "dnf repoquery -l " + " ".join(list(set(pkgs))),`
		`]`

		`Settings.get_logger().debug("Running: %s", " ".join(cmd))`

thebeanogamer commented 2 years ago

dnf5 does not currently support the -C argument. Rawhide has just switched over to dnf5, so all FedoraReview tests run against Rawhide (the default) are failing.

fedora#2217093 is tracking adding this argument to dnf5, and once it's completed we should put this argument back on.

In combination with #479, this closer to functional. There are still other dnf5 changes that I'm working on.

frostyx commented 2 years ago

I wanted to merge but then I found out that dnf5 repoquery also misses the -l parameter. What do you think about using dnf-3 repoquery until they fix the regressions? I implemented the change in PR#485.