Skip to content

Commit

Permalink
sagemathgh-36947: sage -package download: Fix argparse for `--no-ch…
Browse files Browse the repository at this point in the history
…eck-certificate`

<!-- ^^^^^
Please provide a concise, informative and self-explanatory title.
Don't put issue numbers in there, do this in the PR body below.
For example, instead of "Fixes sagemath#1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->
A mistake in sagemath#36774 broke the macOS CI in 10.3.beta3, see
https://github.com/sagemath/sage/actions/runs/7255417440/job/19765989346
#step:9:1425
```
  [patch-2.7.5] error installing, exit status 1. End of log file:
  [patch-2.7.5]   usage: sage --package [-h] [--log LOG] [--no-check-
certificate]
  [patch-2.7.5]
{config,list,name,tarball,apropos,update,update-
latest,download,upload,fix-checksum,create,clean}
  [patch-2.7.5]                         ...
  [patch-2.7.5]   sage --package: error: unrecognized arguments: --no-
check-certificate
  [patch-2.7.5]
************************************************************************
  [patch-2.7.5]   Error downloading tarball of patch
  [patch-2.7.5]
************************************************************************
```

We make the one-line fix for this here.

Tests (with other merged branches) at
https://github.com/mkoeppe/sage/actions/runs/7295997767/job/19883171237

<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->
<!-- If your change requires a documentation PR, please link it
appropriately -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
<!-- Feel free to remove irrelevant items. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

URL: sagemath#36947
Reported by: Matthias Köppe
Reviewer(s): Kwankyu Lee
  • Loading branch information
Release Manager committed Dec 27, 2023
2 parents 39cc971 + de08b80 commit 22cf16e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=05115739db242cb5a48ae17f97d06b179fc70334
md5=adc8208885e6be527b089b682079c464
cksum=3321256447
sha1=1ef165f927d6a690aa33ca673e534fec32911cb1
md5=b6197e5ff305f5246cd86fc9194de932
cksum=2267802208
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e95536ccbad199de456e804968a775f2744e4bff
eb61f64ed61593a7b75d893b4d2896c5e0f3cc3e
2 changes: 1 addition & 1 deletion build/sage_bootstrap/cmdline.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ def make_parser():
parser_download.add_argument(
'--on-error', choices=['stop', 'warn'], default='stop',
help='What to do if the tarball cannot be downloaded')
parser.add_argument(
parser_download.add_argument(
'--no-check-certificate', action='store_true',
help='Do not check SSL certificates for https connections')

Expand Down

0 comments on commit 22cf16e

Please sign in to comment.