admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #7920 from dawidd6/pr-upload-keep-old

Browse Source 
dev-cmd/pr-upload: add --keep-old flag
This commit is contained in:
Dawid Dziurla 2020-07-06 21:16:35 +02:00 committed by GitHub
commit 9cce4c5be3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/dev-cmd/pr-upload.rb
View File

@ -15,6 +15,9 @@ module Homebrew
EOS EOS
switch "--no-publish", switch "--no-publish",
description: "Apply the bottle commit and upload the bottles, but don't publish them." description: "Apply the bottle commit and upload the bottles, but don't publish them."
switch "--keep-old",
description: "If the formula specifies a rebuild version, " \
"attempt to preserve its value in the generated DSL."
switch "-n", "--dry-run", switch "-n", "--dry-run",
description: "Print what would be done rather than doing it." description: "Print what would be done rather than doing it."
switch "--warn-on-upload-failure", switch "--warn-on-upload-failure",
@ -38,6 +41,7 @@ module Homebrew
bottle_args = ["bottle", "--merge", "--write"] bottle_args = ["bottle", "--merge", "--write"]
bottle_args << "--verbose" if args.verbose? bottle_args << "--verbose" if args.verbose?
bottle_args << "--debug" if args.debug? bottle_args << "--debug" if args.debug?
bottle_args << "--keep-old" if args.keep_old?
bottle_args << "--root-url=#{args.root_url}" if args.root_url bottle_args << "--root-url=#{args.root_url}" if args.root_url
odie "No JSON files found in the current working directory" if Dir["*.json"].empty? odie "No JSON files found in the current working directory" if Dir["*.json"].empty?
bottle_args += Dir["*.json"] bottle_args += Dir["*.json"]

2
docs/Manpage.md
View File

@ -924,6 +924,8 @@ Apply the bottle commit and publish bottles to Bintray.
* `--no-publish`: * `--no-publish`:
Apply the bottle commit and upload the bottles, but don't publish them. Apply the bottle commit and upload the bottles, but don't publish them.
* `--keep-old`:
If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL.
* `-n`, `--dry-run`: * `-n`, `--dry-run`:
Print what would be done rather than doing it. Print what would be done rather than doing it.
* `--warn-on-upload-failure`: * `--warn-on-upload-failure`:

4
manpages/brew.1
View File

@ -1211,6 +1211,10 @@ Apply the bottle commit and publish bottles to Bintray\.
Apply the bottle commit and upload the bottles, but don\'t publish them\. Apply the bottle commit and upload the bottles, but don\'t publish them\.
. .
.TP .TP
\fB\-\-keep\-old\fR
If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL\.
.
.TP
\fB\-n\fR, \fB\-\-dry\-run\fR \fB\-n\fR, \fB\-\-dry\-run\fR
Print what would be done rather than doing it\. Print what would be done rather than doing it\.
. .