Hello community,
here is the log from the commit of package yast2-http-server for
openSUSE:Factory checked in at 2015-01-30 06:12:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-05 21:04:32.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes
2015-01-30 06:12:24.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Jan 22 13:27:42 UTC 2015 - jsr...@suse.cz
+
+- check for manually created files in order to prevent data loss
+ (bsc#860856)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.3hI3yS/_old 2015-01-30 06:12:25.000000000 +0100
+++ /var/tmp/diff_new_pack.3hI3yS/_new 2015-01-30 06:12:25.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-http-server
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,7 +31,7 @@
BuildRequires: popt-devel
BuildRequires: sgml-skel
BuildRequires: update-desktop-files
-BuildRequires: yast2
+BuildRequires: yast2 >= 3.1.118
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-network
BuildRequires: yast2-packagemanager-devel
@@ -42,7 +42,7 @@
Requires: yast2-perl-bindings
# DnsServerApi moved to yast2.rpm (bnc#392606)
# Wizard::SetDesktopTitleAndIcon
-Requires: yast2 >= 2.21.22
+Requires: yast2 >= 3.1.118
BuildArch: noarch
++++++ yast2-http-server-3.1.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-3.1.6/package/yast2-http-server.changes
new/yast2-http-server-3.1.6/package/yast2-http-server.changes
--- old/yast2-http-server-3.1.6/package/yast2-http-server.changes
2014-12-04 13:36:33.000000000 +0100
+++ new/yast2-http-server-3.1.6/package/yast2-http-server.changes
2015-01-27 13:38:50.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Jan 22 13:27:42 UTC 2015 - jsr...@suse.cz
+
+- check for manually created files in order to prevent data loss
+ (bsc#860856)
+
+-------------------------------------------------------------------
Thu Dec 4 09:50:14 UTC 2014 - jreidin...@suse.com
- remove X-KDE-Library from desktop file (bnc#899104)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-3.1.6/package/yast2-http-server.spec
new/yast2-http-server-3.1.6/package/yast2-http-server.spec
--- old/yast2-http-server-3.1.6/package/yast2-http-server.spec 2014-12-04
13:36:33.000000000 +0100
+++ new/yast2-http-server-3.1.6/package/yast2-http-server.spec 2015-01-27
13:38:50.000000000 +0100
@@ -25,12 +25,13 @@
Group: System/YaST
License: GPL-2.0
-BuildRequires: yast2-network docbook-xsl-stylesheets doxygen libxslt
perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2
yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libzio
+BuildRequires: yast2-network docbook-xsl-stylesheets doxygen libxslt
perl-XML-Writer popt-devel sgml-skel update-desktop-files
yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libzio
BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2 >= 3.1.118
Requires: yast2-network yast2-perl-bindings libzio
# DnsServerApi moved to yast2.rpm (bnc#392606)
# Wizard::SetDesktopTitleAndIcon
-Requires: yast2 >= 2.21.22
+Requires: yast2 >= 3.1.118
BuildArchitectures: noarch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-http-server-3.1.6/src/modules/HttpServer.rb
new/yast2-http-server-3.1.6/src/modules/HttpServer.rb
--- old/yast2-http-server-3.1.6/src/modules/HttpServer.rb 2014-12-04
13:36:33.000000000 +0100
+++ new/yast2-http-server-3.1.6/src/modules/HttpServer.rb 2015-01-27
13:38:50.000000000 +0100
@@ -13,6 +13,9 @@
module Yast
class HttpServerClass < Module
+
+ include Yast::Logger
+
def main
Yast.import "UI"
textdomain "http-server"
@@ -34,6 +37,7 @@
Yast.import "Confirm"
Yast.import "SuSEFirewallServices"
Yast.import "FileChanges"
+ Yast.import "Label"
# Abort function
# return boolean return true if abort
@@ -71,6 +75,17 @@
]
end
+ IGNORED_FILES = ["vhost.template", "vhost-ssl.template"]
+ APACHE_VHOSTS_DIR = "/etc/apache2/vhosts.d"
+
+ def dynamic_files_to_check
+ files = SCR.Read(path(".target.dir"), APACHE_VHOSTS_DIR)
+ files.reject! { |f| IGNORED_FILES.include?(f) }
+ files.map! { |f| File.join(APACHE_VHOSTS_DIR, f) }
+ log.info "dynamic files: #{files}"
+ files
+ end
+
# Data was modified?
# @return true if modified
def Modified
@@ -282,7 +297,13 @@
YaST::HTTPDData.ReadModules
YaST::HTTPDData.ReadService
- return false if !FileChanges.CheckFiles(@files_to_check)
+ if !FileChanges.CheckFiles(@files_to_check + dynamic_files_to_check())
+ return false
+ end
+
+ if !FileChanges.CheckNewCreatedFiles(dynamic_files_to_check())
+ return false
+ end
# check the modules RPMs
modules = YaST::HTTPDData.GetModuleList
@@ -482,7 +503,7 @@
# map<string, any> test = (map<string,
any>)SCR::Execute(.target.bash_output, "apache2ctl conftest");
#y2internal("test %1", test);
- Builtins.foreach(@files_to_check) do |file|
+ (@files_to_check + dynamic_files_to_check()).each do |file|
FileChanges.StoreFileCheckSum(file)
end
# translators: progress finished
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
