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

Merge pull request #15968 from MikeMcQuaid/cask_upgrade_sudo_test_fix

Browse Source 
cask/quarantine: don't try to sudo during tests.
This commit is contained in:
Mike McQuaid 2023-09-06 10:17:37 -04:00 committed by GitHub
commit d5d74788b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cask/artifact/moved.rb
View File

@ -91,7 +91,7 @@ module Cask
command.run!("/bin/cp", args: ["-pR", *source.children, target], command.run!("/bin/cp", args: ["-pR", *source.children, target],
sudo: true) sudo: true)
end end
Quarantine.copy_xattrs(source, target) Quarantine.copy_xattrs(source, target, command: command)
source.rmtree source.rmtree
elsif target.dirname.writable? elsif target.dirname.writable?
FileUtils.move(source, target) FileUtils.move(source, target)

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

@ -174,11 +174,11 @@ module Cask
raise CaskQuarantinePropagationError.new(to, quarantiner.stderr) raise CaskQuarantinePropagationError.new(to, quarantiner.stderr)
end end
sig { params(from: Pathname, to: Pathname).void } sig { params(from: Pathname, to: Pathname, command: T.class_of(SystemCommand)).void }
def self.copy_xattrs(from, to) def self.copy_xattrs(from, to, command:)
odebug "Copying xattrs from #{from} to #{to}" odebug "Copying xattrs from #{from} to #{to}"
system_command!( command.run!(
swift, swift,
args: [ args: [
*swift_target_args, *swift_target_args,