From dea695ce2cb0a0f734c8c00069554fc73cb826df Mon Sep 17 00:00:00 2001
From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
Date: Apr 26 2023 21:04:53 +0000
Subject: Improve invalid branch name error message


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>

---

diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
index 9973286..98c9f03 100644
--- a/fedpkg/__init__.py
+++ b/fedpkg/__init__.py
@@ -138,9 +138,12 @@ class Commands(pyrpkg.Commands):
             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,