Merge pull request #80 from yast/correct-program-paths

Don't use nonexisting programs
yast · Feb 27, 2019 · 6ab554b · 6ab554b
2 parents 0173791 + 2a1f4fc
commit 6ab554b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/package/yast2-nfs-client.changes b/package/yast2-nfs-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 27 12:04:37 UTC 2019 - mvidner@suse.com
+
+- Use /sbin/rpcinfo only, /usr/sbin/rpcinfo is gone (bsc#1127138).
+- 4.1.5
+
 -------------------------------------------------------------------
 Fri Dec 28 11:54:27 CET 2018 - schubi@suse.de
 

diff --git a/package/yast2-nfs-client.spec b/package/yast2-nfs-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-nfs-client
-Version:        4.1.4
+Version:        4.1.5
 Release:        0
 Url:            https://github.com/yast/yast-nfs-client
 

diff --git a/src/modules/Nfs.rb b/src/modules/Nfs.rb
@@ -553,20 +553,10 @@ def AutoPackages
     # Uses RPC broadcast to mountd.
     # @return [Array<String>] a list of hostnames
     def ProbeServers
-      # newer, shinier, better rpcinfo from rpcbind (#450056)
-      prog_name = "/sbin/rpcinfo"
-      delim = ""
-
-      # fallback from glibc (uses different field separators, grr :( )
-      # TODO: looks like glibc no longer contain this fallback?
-      if !FileUtils.Exists(prog_name)
-        prog_name = "/usr/sbin/rpcinfo"
-        delim = "-d ' ' "
-      end
-
       # #71064
       # this works also if ICMP broadcasts are ignored
-      cmd = "#{prog_name} -b mountd 1 | /usr/bin/cut #{delim} -f 2 | /usr/bin/sort -u"
+      # newer, shinier, better rpcinfo from rpcbind (#450056)
+      cmd = "/sbin/rpcinfo -b mountd 1 | /usr/bin/cut -f 2 | /usr/bin/sort -u"
       out = Convert.to_map(SCR.Execute(path(".target.bash_output"), cmd))
       Ops.get_string(out, "stdout", "").lines.map(&:strip).reject(&:empty?)
     end