Merge pull request #86 from yast/sw_02

accept symlinks to block devices and files in dialogs (bsc#1123316)
yast · Feb 20, 2019 · 70bfd83 · 70bfd83
2 parents 7e62818 + 0e3021f
commit 70bfd83
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/package/yast2-iscsi-lio-server.changes b/package/yast2-iscsi-lio-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 20 13:09:38 UTC 2019 - snwint@suse.com
+
+- accept symlinks to block devices and files in dialogs (bsc#1123316)
+- 4.0.12
+
 -------------------------------------------------------------------
 Wed Jun 27 15:21:50 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2-iscsi-lio-server.spec b/package/yast2-iscsi-lio-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-iscsi-lio-server
-Version:        4.0.11
+Version:        4.0.12
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/iscsi-lio-server/UI_dialogs.rb b/src/include/iscsi-lio-server/UI_dialogs.rb
@@ -2710,8 +2710,7 @@ def validate
       @lun_path_input.value = nil
       return false
     end
-    file_type = File.ftype(file)
-    if (file_type != 'blockSpecial') && (file_type != 'file')
+    if !File.file?(file) && !File.blockdev?(file)
       Yast::Popup.Error(_('Please provide a normal file or a block device.'))
       @lun_path_input.value = nil
       return false
@@ -2727,8 +2726,7 @@ def is_valid
     if !(File.exist?(file))
       return false
     end
-    file_type = File.ftype(file)
-    if (file_type != 'blockSpecial') && (file_type != 'file')
+    if !File.file?(file) && !File.blockdev?(file)
       return false
     end
     true
@@ -2883,7 +2881,7 @@ def handle(event)
           lun_name = ret[1]
           file = ret[2]
           if !file.nil? && (File.exist?(file))
-            @lun_table.add_lun_item([rand(9999), lun_number, lun_name, file, File.ftype(file)])
+            @lun_table.add_lun_item([rand(9999), lun_number, lun_name, file, File.stat(file).ftype])
           end
         end
       when :delete