Merge pull request #2073 from conda-forge/beckermr-patch-2

fix: bug in new expiration cli
conda-forge · Oct 1, 2024 · 3678746 · 3678746
2 parents 028c5a8 + 5d1dec2
commit 3678746
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/conda_smithy/cli.py b/conda_smithy/cli.py
@@ -952,6 +952,10 @@ def __call__(self, args):
             unique_token_per_provider=args.unique_token_per_provider,
         )
 
+        if args.existing_tokens_time_to_expiration is not None:
+            expiry = int(args.existing_tokens_time_to_expiration)
+        else:
+            expiry = None
         # then if that works do the github repo
         if args.unique_token_per_provider:
             for ci_pretty in self.ci_names:
@@ -962,19 +966,15 @@ def __call__(self, args):
                         repo,
                         token_repo,
                         provider=ci,
-                        existing_tokens_time_to_expiration=int(
-                            args.existing_tokens_time_to_expiration
-                        ),
+                        existing_tokens_time_to_expiration=expiry,
                     )
         else:
             register_feedstock_token(
                 owner,
                 repo,
                 token_repo,
                 provider=None,
-                existing_tokens_time_to_expiration=int(
-                    args.existing_tokens_time_to_expiration
-                ),
+                existing_tokens_time_to_expiration=expiry,
             )
 
         print("Successfully registered the feedstock token!")

diff --git a/news/bug-expiry.rst b/news/bug-expiry.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* Fixed a bug in processing CLI arguments for token expiration times. (#2073)
+
+**Security:**
+
+* <news item>