From ff5830b9a2d0851367ff8e7ac22d1dfe895a245b Mon Sep 17 00:00:00 2001
From: James Kunstle <jkunstle@jkunstle.remote.csb>
Date: Jul 01 2021 17:16:32 +0000
Subject: advertised set-x-token method in do_fork and set_pagure_issue


The new commmands set-distgit-token and set-pagure-token were added but were not sufficiently advertised in the case that the user's API key did indeed fail. This change fixes this, adding the advertisement of the command to the relevant command failures.

Signed-off-by: James Kunstle <jkunstle@redhat.com>

---

diff --git a/fedpkg/utils.py b/fedpkg/utils.py
index 16bcfda..4671b50 100644
--- a/fedpkg/utils.py
+++ b/fedpkg/utils.py
@@ -132,9 +132,9 @@ def new_pagure_issue(logger, url, token, title, body, cli_name):
         # show the user
         # show hint for expired token
         if re.search(r"Invalid or expired token", rv_error, re.IGNORECASE):
-            base_error_msg += '\nFor invalid or expired token refer to ' \
-                '"{0} request-repo -h" to set a token in your user ' \
-                'configuration.'.format(cli_name)
+            base_error_msg += '\nFor invalid or expired tokens please ' \
+                'set a new token in your user configuration with:' \
+                '\n\n\t{0} set-pagure-token <token>\n'.format(cli_name)
         raise rpkgError(base_error_msg.format(rv_error))
 
     return '{0}/releng/fedora-scm-requests/issue/{1}'.format(
@@ -190,9 +190,9 @@ def do_fork(logger, base_url, token, repo_name, namespace, cli_name):
 
         # show hint for expired token
         if re.search(r"Invalid or expired token", rv_error, re.IGNORECASE):
-            base_error_msg += '\nFor invalid or expired token refer to ' \
-                '"{0} fork -h" to set a token in your user ' \
-                'configuration.'.format(cli_name)
+            base_error_msg += '\nFor invalid or expired tokens please ' \
+                'set a new token in your user configuration with:' \
+                '\n\n\t{0} set-distgit-token <token>\n'.format(cli_name)
         raise rpkgError(base_error_msg.format(rv_error))
 
     return True
diff --git a/test/test_utils.py b/test/test_utils.py
index 2b6e5b0..989a4f7 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -386,8 +386,9 @@ class TestNewPagureIssue(unittest.TestCase):
 
         six.assertRaisesRegex(
             self, rpkgError,
-            'For invalid or expired token refer to "fedpkg request-repo -h" to set '
-            'a token in your user configuration.',
+            '\nFor invalid or expired tokens please '
+            'set a new token in your user configuration with:'
+            '\n\n\tfedpkg set-pagure-token <token>\n',
             utils.new_pagure_issue,
             logger, 'http://distgit/', '123456', 'new package', {'repo': 'pkg1'}, 'fedpkg')