Hello community,

here is the log from the commit of package yast2-ftp-server for 
openSUSE:Factory checked in at 2018-04-22 14:40:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ftp-server (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-ftp-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-ftp-server"

Sun Apr 22 14:40:57 2018 rev:60 rq:599520 version:4.0.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ftp-server/yast2-ftp-server.changes        
2018-03-24 16:16:08.993832591 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-ftp-server.new/yast2-ftp-server.changes   
2018-04-22 14:40:57.782094504 +0200
@@ -1,0 +2,9 @@
+Fri Apr 20 13:34:41 UTC 2018 - knut.anders...@suse.com
+
+- bsc#1090387
+  - Do not cache widgets description until the ftp dialog is really
+    run to avoid showing an out of date firewall description (the
+    vsftpd package provides the firewalld service definition)
+- 4.0.5
+
+-------------------------------------------------------------------

Old:
----
  yast2-ftp-server-4.0.4.tar.bz2

New:
----
  yast2-ftp-server-4.0.5.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-ftp-server.spec ++++++
--- /var/tmp/diff_new_pack.Shddzo/_old  2018-04-22 14:40:58.442070624 +0200
+++ /var/tmp/diff_new_pack.Shddzo/_new  2018-04-22 14:40:58.442070624 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ftp-server
-Version:        4.0.4
+Version:        4.0.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-ftp-server-4.0.4.tar.bz2 -> yast2-ftp-server-4.0.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-ftp-server-4.0.4/package/yast2-ftp-server.changes 
new/yast2-ftp-server-4.0.5/package/yast2-ftp-server.changes
--- old/yast2-ftp-server-4.0.4/package/yast2-ftp-server.changes 2018-03-22 
17:20:39.000000000 +0100
+++ new/yast2-ftp-server-4.0.5/package/yast2-ftp-server.changes 2018-04-20 
16:14:38.000000000 +0200
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Fri Apr 20 13:34:41 UTC 2018 - knut.anders...@suse.com
+
+- bsc#1090387
+  - Do not cache widgets description until the ftp dialog is really
+    run to avoid showing an out of date firewall description (the
+    vsftpd package provides the firewalld service definition)
+- 4.0.5
+
+-------------------------------------------------------------------
 Wed Mar 21 13:09:03 UTC 2018 - mfi...@suse.com
 
 - bnc#1084434
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ftp-server-4.0.4/package/yast2-ftp-server.spec 
new/yast2-ftp-server-4.0.5/package/yast2-ftp-server.spec
--- old/yast2-ftp-server-4.0.4/package/yast2-ftp-server.spec    2018-03-22 
17:20:39.000000000 +0100
+++ new/yast2-ftp-server-4.0.5/package/yast2-ftp-server.spec    2018-04-20 
16:14:38.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ftp-server
-Version:        4.0.4
+Version:        4.0.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-ftp-server-4.0.4/src/include/ftp-server/dialogs.rb 
new/yast2-ftp-server-4.0.5/src/include/ftp-server/dialogs.rb
--- old/yast2-ftp-server-4.0.4/src/include/ftp-server/dialogs.rb        
2018-03-22 17:20:39.000000000 +0100
+++ new/yast2-ftp-server-4.0.5/src/include/ftp-server/dialogs.rb        
2018-04-20 16:14:38.000000000 +0200
@@ -24,13 +24,14 @@
 
       Yast.include include_target, "ftp-server/helps.rb"
       Yast.include include_target, "ftp-server/wid_functions.rb"
+    end
 
-      # map for description of widget later in CWNTree
-      # widget_descr (vsftpd)
-      #
-      # @return [Hash{String,map<String => Object>}]
-
-      @wid_handling_vsftpd = {
+    # map for description of widget later in CWNTree
+    # widget_descr (vsftpd)
+    #
+    # @return [Hash{String,map<String => Object>}]
+    def wid_handling_vsftpd
+      @wid_handling_vsftpd ||= {
         "StartMode"        => 
CWMServiceStart.CreateAutoStartWidget(StartMode()),
         "StartStop"        => 
CWMServiceStart.CreateStartStopWidget(StartStop()),
         "StartStopRestart" => StartStopRestart(),
@@ -65,24 +66,27 @@
           FirewallSettingsVs()
         )
       }
+    end
 
-      # map for screens of widget later in CWNTree
-      # screens (vsftpd)
-      #
-      # @return [Hash{String,map<String => Object>}]
-
-      @tabs_vsftpd = {
+    # map for screens of widget later in CWNTree
+    # screens (vsftpd)
+    #
+    # @return [Hash{String,map<String => Object>}]
+    def tabs_vsftpd
+      @tabs_vsftpd ||= {
         "start_up"        => start_up,
         "gen_settings"    => gen_settings,
         "perfor_settings" => perfor_settings,
         "anon_settings"   => vsftpd_anon_settings,
         "addit_settings"  => addit_settings
       }
+    end
 
-      # function for running CWNTree
-      #
-      # abort functions for confirm abort
-      #
+    # function for running CWNTree
+    #
+    # abort functions for confirm abort
+    #
+    def functions
       @functions = { abort: fun_ref(method(:AbortDialog), "boolean ()") }
     end
 
@@ -1318,12 +1322,12 @@
 
       deep_copy(result)
     end
+
     # Init function where are added UI hadle functions
     # Expert Settings widget (vsftpd)
     # define for tabs_vsftpd necessary later in screens (CWNTree)
     #
     # @return [Hash{String => Object}] map for Expert Settings widget
-
     def addit_settings
       result = {}
 
@@ -1409,12 +1413,12 @@
       DialogTree.ShowAndRun(
         "ids_order"      => sim_dialogs,
         "initial_screen" => "start_up",
-        "screens"        => @tabs_vsftpd,
-        "widget_descr"   => @wid_handling_vsftpd,
+        "screens"        => tabs_vsftpd,
+        "widget_descr"   => wid_handling_vsftpd,
         "back_button"    => "",
         "abort_button"   => Label.CancelButton,
         "next_button"    => Label.FinishButton,
-        "functions"      => @functions
+        "functions"      => functions
       )
     end
   end


Reply via email to