Control: tags -1 patch

The attached patch was tested on my Trixie and works fine.

-- 
rsa4096: 3B10 0CA1 8674 ACBA B4FE  FCD2 CE5B CF17 9960 DE13
ed25519: FFB4 0CC3 7F2E 091D F7DA  356E CC79 2832 ED38 CB05
From: Patrick Poortman <p.poort...@exonet.nl>
Date: Tue Apr 2 15:18:20 2024 +0200
Subject: provisioner/ansible: Fix ansible version gathering in host provisioner

Origin: Upstream (merged) PR https://github.com/hashicorp/vagrant/pull/13375
Bug-Debian: https://bugs.debian.org/1108514
---
 plugins/provisioners/ansible/provisioner/host.rb           |    2 +-
 test/unit/plugins/provisioners/ansible/provisioner_test.rb |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: b/plugins/provisioners/ansible/provisioner/host.rb
===================================================================
--- a/plugins/provisioners/ansible/provisioner/host.rb
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -110,7 +110,7 @@ module VagrantPlugins
         def gather_ansible_version
           raw_output = ''
           command = ['python3', '-c',
-                     "\"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))\""]
+                     "import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))"]
 
           command << {
             notify: [:stdout, :stderr]
Index: b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
===================================================================
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -74,7 +74,7 @@ VF
   def self.it_should_check_ansible_version
     it "execute 'Python ansible version check before executing 'ansible-playbook'" do
       expect(Vagrant::Util::Subprocess).to receive(:execute)
-        .once.with('python3', '-c', "\"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))\"", { notify: %i[
+        .once.with('python3', '-c', "import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))", { notify: %i[
                      stdout stderr
                    ] })
       expect(Vagrant::Util::Subprocess).to receive(:execute)
@@ -1052,7 +1052,7 @@ VF
         expect(Vagrant::Util::Subprocess).to receive(:execute)
           .once
           .with('python3', '-c',
-                "\"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))\"", { notify: %i[stdout stderr] })
+                "import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))", { notify: %i[stdout stderr] })
           .and_return(default_execute_result)
         expect(Vagrant::Util::Subprocess).to receive(:execute)
           .once

Attachment: signature.asc
Description: PGP signature

_______________________________________________
Pkg-ruby-extras-maintainers mailing list
Pkg-ruby-extras-maintainers@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-ruby-extras-maintainers

Reply via email to