From 3b541577cb0deecb118aec355d2cbff8bdd6e296 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 12 Apr 2023 21:54:09 +0300 Subject: [PATCH] Respect RPM provides In ROSA Linux sshfs is named as sshfs-fuse, not fuse-sshfs, but provides "sshfs" and "fuse-sshfs": https://abf.io/import/sshfs-fuse/blob/4c22a0a852/sshfs-fuse.spec#lc-20 Do not fail in such cases. --- lib/vagrant-sshfs/cap/guest/alma/sshfs_client.rb | 2 +- lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb | 2 +- lib/vagrant-sshfs/cap/guest/fedora/sshfs_client.rb | 2 +- lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb | 2 +- lib/vagrant-sshfs/cap/guest/rocky/sshfs_client.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/vagrant-sshfs/cap/guest/alma/sshfs_client.rb b/lib/vagrant-sshfs/cap/guest/alma/sshfs_client.rb index d6410ca..1b7962b 100644 --- a/lib/vagrant-sshfs/cap/guest/alma/sshfs_client.rb +++ b/lib/vagrant-sshfs/cap/guest/alma/sshfs_client.rb @@ -20,7 +20,7 @@ def self.sshfs_install(machine) end def self.sshfs_installed(machine) - machine.communicate.test("rpm -q fuse-sshfs") + machine.communicate.test("rpm -q --whatprovides fuse-sshfs") end protected diff --git a/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb b/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb index 6e708a6..02488a9 100644 --- a/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb +++ b/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb @@ -33,7 +33,7 @@ def self.sshfs_install(machine) end def self.sshfs_installed(machine) - machine.communicate.test("rpm -q fuse-sshfs") + machine.communicate.test("rpm -q --whatprovides fuse-sshfs") end protected diff --git a/lib/vagrant-sshfs/cap/guest/fedora/sshfs_client.rb b/lib/vagrant-sshfs/cap/guest/fedora/sshfs_client.rb index 826f556..d8a0657 100644 --- a/lib/vagrant-sshfs/cap/guest/fedora/sshfs_client.rb +++ b/lib/vagrant-sshfs/cap/guest/fedora/sshfs_client.rb @@ -7,7 +7,7 @@ def self.sshfs_install(machine) end def self.sshfs_installed(machine) - machine.communicate.test("rpm -q fuse-sshfs") + machine.communicate.test("rpm -q --whatprovides fuse-sshfs") end end end diff --git a/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb b/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb index 425f1ca..892a763 100644 --- a/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb +++ b/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb @@ -24,7 +24,7 @@ def self.sshfs_install(machine) end def self.sshfs_installed(machine) - machine.communicate.test("rpm -q fuse-sshfs") + machine.communicate.test("rpm -q --whatprovides fuse-sshfs") end protected diff --git a/lib/vagrant-sshfs/cap/guest/rocky/sshfs_client.rb b/lib/vagrant-sshfs/cap/guest/rocky/sshfs_client.rb index d8973d7..8473317 100644 --- a/lib/vagrant-sshfs/cap/guest/rocky/sshfs_client.rb +++ b/lib/vagrant-sshfs/cap/guest/rocky/sshfs_client.rb @@ -20,7 +20,7 @@ def self.sshfs_install(machine) end def self.sshfs_installed(machine) - machine.communicate.test("rpm -q fuse-sshfs") + machine.communicate.test("rpm -q --whatprovides fuse-sshfs") end protected