Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2014-08-30 16:04:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-http-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2014-07-31 07:42:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2014-08-30 16:04:40.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Aug 29 14:36:49 CEST 2014 - schubi@suse.de + +- Autoyast conifuration: "main" defines the default server configured in + /etc/apache2/default-server.conf. This has already been + defined in YaPI::HTTPD and has to be updated only. + (bnc#893100) +- 3.1.2 + +------------------------------------------------------------------- Old: ---- yast2-http-server-3.1.1.tar.bz2 New: ---- yast2-http-server-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.uK4ETZ/_old 2014-08-30 16:04:42.000000000 +0200 +++ /var/tmp/diff_new_pack.uK4ETZ/_new 2014-08-30 16:04:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-http-server-3.1.1.tar.bz2 -> yast2-http-server-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.1/package/yast2-http-server.changes new/yast2-http-server-3.1.2/package/yast2-http-server.changes --- old/yast2-http-server-3.1.1/package/yast2-http-server.changes 2014-07-30 17:49:43.000000000 +0200 +++ new/yast2-http-server-3.1.2/package/yast2-http-server.changes 2014-08-29 15:09:10.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Aug 29 14:36:49 CEST 2014 - schubi@suse.de + +- Autoyast conifuration: "main" defines the default server configured in + /etc/apache2/default-server.conf. This has already been + defined in YaPI::HTTPD and has to be updated only. + (bnc#893100) +- 3.1.2 + +------------------------------------------------------------------- Wed Jul 30 15:03:11 UTC 2014 - cwh@suse.com - replaced given/when by regular if/elsif cascades to get rid of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.1/package/yast2-http-server.spec new/yast2-http-server-3.1.2/package/yast2-http-server.spec --- old/yast2-http-server-3.1.1/package/yast2-http-server.spec 2014-07-30 17:49:43.000000000 +0200 +++ new/yast2-http-server-3.1.2/package/yast2-http-server.spec 2014-08-29 15:09:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.1/src/clients/http-server_auto.rb new/yast2-http-server-3.1.2/src/clients/http-server_auto.rb --- old/yast2-http-server-3.1.1/src/clients/http-server_auto.rb 2014-07-30 17:49:43.000000000 +0200 +++ new/yast2-http-server-3.1.2/src/clients/http-server_auto.rb 2014-08-29 15:09:10.000000000 +0200 @@ -75,16 +75,17 @@ # Read current state elsif @func == "Read" Yast.import "Progress" + old_progress = Progress.set(false) #off(); Progress.off @ret = HttpServer.Read - Progress.on + Progress.set(old_progress) # Write givven settings elsif @func == "Write" Yast.import "Progress" - Progress.off + old_progress = Progress.set(false) #off(); HttpServer.write_only = true @ret = HttpServer.Write - Progress.on + Progress.set(old_progress) else Builtins.y2error("Unknown function: %1", @func) @ret = false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.1/src/modules/HttpServer.rb new/yast2-http-server-3.1.2/src/modules/HttpServer.rb --- old/yast2-http-server-3.1.1/src/modules/HttpServer.rb 2014-07-30 17:49:43.000000000 +0200 +++ new/yast2-http-server-3.1.2/src/modules/HttpServer.rb 2014-08-29 15:09:10.000000000 +0200 @@ -243,7 +243,7 @@ end end - Progress.set(false) #off(); + old_progress = Progress.set(false) #off(); SuSEFirewall.Read if Package.Installed("bind") if Ops.greater_than( @@ -271,7 +271,7 @@ Builtins.y2warning("Package bind is not installed.") end Builtins.y2internal("DNS running and configured: %1", @configured_dns) - Progress.set(true) #on(); + Progress.set(old_progress) #on(); # read current settings from httpd.conf and sysconfig Progress.NextStage @@ -310,7 +310,7 @@ Progress.NextStage # read current settings for firewall and network - Progress.set(false) #off(); + old_progress = Progress.set(false) #off(); NetworkInterfaces.Read # generate the map: static IP -> device @@ -361,7 +361,7 @@ ) - Progress.set(true) #on(); + Progress.set(old_progress) #on(); # translators: progress step ProgressNextStage(_("Finished")) @@ -380,7 +380,7 @@ # HttpServer read dialog caption caption = _("Saving HTTP Server Configuration") - steps = 2 + steps = 3 # We do not set help text here, because it was set outside Progress.New( @@ -431,7 +431,7 @@ YaST::HTTPDData.WriteHosts Progress.NextStage Yast.import "SuSEFirewall" - Progress.set(false) # Progress::off (); + old_progress = Progress.set(false) # off(); # always adapt firewall if YaST::HTTPDData.WriteListen(false) == nil @@ -452,7 +452,7 @@ SuSEFirewall.Write DnsServerAPI.Write if @configured_dns - Progress.set(true) + Progress.set(old_progress) YaST::HTTPDData.WriteModuleList # in autoyast, quit here # Wrong, service still has to be enabled... @@ -583,13 +583,25 @@ end # setup hosts - # foreach (string host, list