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

Merge pull request #15412 from JBYoshi/cask-upgrade/named-params

Browse Source 
Fix typing on revert_upgrade().
This commit is contained in:
Markus Reiter 2023-05-12 22:32:11 +02:00 committed by GitHub
commit a1dd95d6ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cask/installer.rb
View File

@ -214,6 +214,7 @@ on_request: true)
Quarantine.propagate(from: primary_container.path, to: to)
end
sig { params(predecessor: T.nilable(Cask)).void }
def install_artifacts(predecessor: nil)
artifacts = @cask.artifacts
already_installed_artifacts = []
@ -390,6 +391,7 @@ on_request: true)
@cask.download_sha_path.atomic_write(@cask.new_download_sha) if @cask.checksumable?
end
sig { params(successor: T.nilable(Cask)).void }
def uninstall(successor: nil)
load_installed_caskfile!
oh1 "Uninstalling Cask #{Formatter.identifier(@cask)}"
@ -411,6 +413,7 @@ on_request: true)
FileUtils.rm_f @cask.download_sha_path if @cask.download_sha_path.exist?
end
sig { params(successor: T.nilable(Cask)).void }
def start_upgrade(successor:)
uninstall_artifacts(successor: successor)
backup
@ -431,7 +434,8 @@ on_request: true)
backup_metadata_path.rename @cask.metadata_versioned_path
end
def revert_upgrade(predecessor)
sig { params(predecessor: Cask).void }
def revert_upgrade(predecessor:)
opoo "Reverting upgrade for Cask #{@cask}"
restore_backup
install_artifacts(predecessor: predecessor)
@ -445,6 +449,7 @@ on_request: true)
puts summary
end
sig { params(clear: T::Boolean, successor: T.nilable(Cask)).void }
def uninstall_artifacts(clear: false, successor: nil)
artifacts = @cask.artifacts

1
Library/Homebrew/cask/quarantine.rb
View File

@ -174,6 +174,7 @@ module Cask
raise CaskQuarantinePropagationError.new(to, quarantiner.stderr)
end
sig { params(from: Pathname, to: Pathname).void }
def self.copy_xattrs(from, to)
odebug "Copying xattrs from #{from} to #{to}"

12
Library/Homebrew/cask/upgrade.rb
View File

@ -131,6 +131,18 @@ module Cask
false
end
sig {
params(
old_cask: Cask,
new_cask: Cask,
binaries: T.nilable(T::Boolean),
force: T.nilable(T::Boolean),
quarantine: T.nilable(T::Boolean),
require_sha: T.nilable(T::Boolean),
skip_cask_deps: T.nilable(T::Boolean),
verbose: T.nilable(T::Boolean),
).void
}
def self.upgrade_cask(
old_cask, new_cask,
binaries:, force:, quarantine:, require_sha:, skip_cask_deps:, verbose: