From 2a9d22ad07df03d55e161202b9fddf2cd5bbd80e Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 19 2017 15:37:23 +0000
Subject: Move try/except out fo the block so it gets its own error message


---

diff --git a/pagure/cli/admin.py b/pagure/cli/admin.py
index 1d82799..3114284 100644
--- a/pagure/cli/admin.py
+++ b/pagure/cli/admin.py
@@ -492,11 +492,6 @@ def do_update_admin_token(args):
 
     try:
         date = arrow.get(args.date, 'YYYY-MM-DD').replace(tzinfo='UTC')
-        if date.naive.date() <= datetime.datetime.utcnow().date():
-            raise pagure.exceptions.PagureException(
-                'You are about to expire this API token using the wrong '
-                'command, please use: pagure-admin admin-token expire'
-            )
     except Exception as err:
         _log.exception(err)
         raise pagure.exceptions.PagureException(
@@ -504,6 +499,12 @@ def do_update_admin_token(args):
             'YYYY-MM-DD' % args.date
         )
 
+    if date.naive.date() <= datetime.datetime.utcnow().date():
+        raise pagure.exceptions.PagureException(
+            'You are about to expire this API token using the wrong '
+            'command, please use: pagure-admin admin-token expire'
+        )
+
     print('%s -- %s -- %s' % (
         token.id, token.user.user, token.expiration))
     print('ACLs:')