Merge pull request #23608 from aholland/quarantine-skip-unavailable

cask/upgrade: don't read quarantine metadata when quarantine is unavailable

Author: MikeMcQuaid

Library/Homebrew/cask/upgrade.rb

@@ -427,21 +427,27 @@ def self.upgrade_cask(
 
         new_cask_installer.fetch
 
-        old_cask.artifacts.grep(Artifact::App).each do |artifact|
-          user_approved = if artifact.target.exist?
-            Quarantine.user_approved?(artifact.target)
-          else
-            false
-          end
-          old_user_approved[artifact.target.to_s] = user_approved
-          # Only an already approved app has approvals to pass on, so skip the scan otherwise.
-          old_approved_paths[artifact.target.to_s] = Quarantine.user_approved_paths(artifact.target) if user_approved
-          old_unquarantined[artifact.target.to_s] = if artifact.target.exist?
-            Quarantine.detect(artifact.target).blank?
-          else
-            false
+        # This snapshot reads quarantine metadata, so it needs the same guard as the code below that uses it.
+        if Quarantine.available?
+          old_cask.artifacts.grep(Artifact::App).each do |artifact|
+            user_approved = if artifact.target.exist?
+              Quarantine.user_approved?(artifact.target)
+            else
+              false
+            end
+            old_user_approved[artifact.target.to_s] = user_approved
+            # Only an already approved app has approvals to pass on, so skip the scan otherwise.
+            if user_approved
+              old_approved_paths[artifact.target.to_s] =
+                Quarantine.user_approved_paths(artifact.target)
+            end
+            old_unquarantined[artifact.target.to_s] = if artifact.target.exist?
+              Quarantine.detect(artifact.target).blank?
+            else
+              false
+            end
+            old_signing_identities[artifact.target.to_s] = Quarantine.signing_identity(artifact.target)
           end
-          old_signing_identities[artifact.target.to_s] = Quarantine.signing_identity(artifact.target)
         end
 
         # Move the old cask's artifacts back to staging

Library/Homebrew/test/cask/upgrade_spec.rb

@@ -768,6 +768,20 @@ def write_info_plist(path, short_version:, bundle_version:)
     end
   end
 
+  context "when quarantine support is unavailable" do
+    before do
+      Cask::Installer.new(Cask::CaskLoader.load(cask_path("outdated/local-caffeine"))).install
+    end
+
+    it "upgrades without reading quarantine metadata" do
+      allow(Cask::Quarantine).to receive(:available?).and_return(false)
+      expect(Cask::Quarantine).not_to receive(:detect)
+
+      expect { described_class.upgrade_casks!(local_caffeine, args:) }
+        .to change(local_caffeine, :installed_version).from("1.2.2").to("1.2.3")
+    end
+  end
+
   context "when upgrading after a forced upgrade without a cask receipt" do
     before do
       InstallHelper.stub_cask_installation(Cask::CaskLoader.load(cask_path("outdated/local-caffeine")))