From 8a1ff9275cd18df4ad0f1f5923b4f1adebbb4bd8 Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Mon, 6 Jul 2020 17:41:07 +0200
Subject: [PATCH] dev-cmd/pr-upload: add --keep-old flag
---
Library/Homebrew/dev-cmd/pr-upload.rb | 4 ++++
docs/Manpage.md | 2 ++
manpages/brew.1 | 4 ++++
3 files changed, 10 insertions(+)
diff --git a/Library/Homebrew/dev-cmd/pr-upload.rb b/Library/Homebrew/dev-cmd/pr-upload.rb
index 39dfd145ba..9453428e91 100644
--- a/Library/Homebrew/dev-cmd/pr-upload.rb
+++ b/Library/Homebrew/dev-cmd/pr-upload.rb
@@ -15,6 +15,9 @@ module Homebrew
EOS
switch "--no-publish",
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",
description: "Print what would be done rather than doing it."
switch "--warn-on-upload-failure",
@@ -38,6 +41,7 @@ module Homebrew
bottle_args = ["bottle", "--merge", "--write"]
bottle_args << "--verbose" if args.verbose?
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
odie "No JSON files found in the current working directory" if Dir["*.json"].empty?
bottle_args += Dir["*.json"]
diff --git a/docs/Manpage.md b/docs/Manpage.md
index aaabdb46e6..2aa5bc9ed3 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -924,6 +924,8 @@ Apply the bottle commit and publish bottles to Bintray.
* `--no-publish`:
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`:
Print what would be done rather than doing it.
* `--warn-on-upload-failure`:
diff --git a/manpages/brew.1 b/manpages/brew.1
index 4972791289..525eeddfd8 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -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\.
.
.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
Print what would be done rather than doing it\.
.
--
GitLab