PR#518: Improve invalid branch name error message - fedpkg

fedpkg

#518 Improve invalid branch name error message

Merged 2 years ago by onosek. Opened 2 years ago by oturpe.

oturpe/fedpkg improve-load-rpmdefines-error-message into master

Improve invalid branch name error message

Otto Liljalaakso • 2 years ago

dea695c

fedpkg/__init__.py

file modified

+6 -3

		`@@ -138,9 +138,12 @@`
		`self._distunset = 'rhel'`
		`# If we don't match one of the above, punt`
		`else:`
		`- raise pyrpkg.rpkgError('Could not find the release/dist from branch name '`
		`- '%s\nPlease specify with --release' %`
		`- self.branch_merge)`
		`+ if self.dist:`
		`+ msg = 'Invalid release \'%s\'.' % self.branch_merge`
		`+ else:`
		`+ msg = 'Could not find release from branch name \'%s\'. Please specify with --release.' % self.branch_merge`
		`+ raise pyrpkg.rpkgError(msg)`
		`+`
		`self._rpmdefines = ["--define", "_sourcedir %s" % self.layout.sourcedir,`
		`"--define", "_specdir %s" % self.layout.specdir,`
		`"--define", "_builddir %s" % self.layout.builddir,`

oturpe commented 2 years ago

Currently, if the resolved release name does not match any supported pattern (rawhide', f38 or so),
the following error is printed:

(foo) $ fedpkg prep
Could not execute prep: Could not find the release/dist from branch name foo
Please specify with --release

This is fine when the current Git branch name was used when resolving the release.
However, the exact same error is printed even if the --release option was used, like this:

$ fedpkg --release foo prep
Could not execute prep: Could not find the release/dist from branch name foo
Please specify with --release

The error message is split into two cases depending on if --release was used
(detected by checking if self.dist is truthy):

(foo) $ fedpkg prep
Could not execute prep: Could not find release from branch name 'foo'. Please specify with --release.
$ fedpkg --release foo prep
Could not execute prep: Invalid release 'foo'.

Signed-off-by: Otto Liljalaakso otto.liljalaakso@iki.fi

rebased onto e6faa11555103b99739dac509b08871ba6d8573c

2 years ago