Merge pull request #37 from yast/replace_regexpmatch

Replace Builtins.regexpmatch with tr when checking options valid characters

package/yast2-nfs-server.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 25 11:38:41 UTC 2019 - Knut Anderssen <kanderssen@suse.com>
+
+- Do not use Builtins.regexpmatch when checking the options as the
+  match is failing with default options depending on the locale
+  used (bsc#1151637)
+- 4.2.2
+
 -------------------------------------------------------------------
 Tue Aug 27 18:20:56 CEST 2019 - schubi@suse.de
 

package/yast2-nfs-server.spec

@@ -18,7 +18,7 @@
 
 Name:           yast2-nfs-server
 Summary:        YaST2 - NFS Server Configuration
-Version:        4.2.1
+Version:        4.2.2
 Release:        0
 URL:            https://github.com/yast/yast-nfs-server
 Group:          System/YaST

src/include/nfs_server/routines.rb

@@ -347,7 +347,7 @@ def CheckNoSpaces(name)
     # @return		whether valid
     def CheckExportOptions(options)
       # colon is allowed for sec= option, see man 5 exports
-      if Builtins.regexpmatch(options, "[^A-Za-z0-9=/.:,_-]")
+      if options.match?(/[^[:alnum:]=\/\.:,_-]/)
         # error popup message
         Report.Error(
           _(

src/include/nfs_server/ui.rb

@@ -200,6 +200,9 @@ def GetAllowedHosts(exports, expath, hosts, opts, allowed, fromedit)
         end
 
         if ret == :optsent
+          # Update the opts value when changed, otherwise the value validated
+          # later could be the cached one.
+          opts = Convert.to_string(UI.QueryWidget(Id(:optsent), :Value))
           # check to see if user has changed options entry in the dialogue
           # thrown due to a "Add Hosts" (as opposed to editing existing ones).
           # If yes, suggest the user with a suitable default option set.