Merge pull request #3 from kobliha/Code-11-SP3

Do not block squid configuration if SuSEfirewall can't be read
yast · Apr 19, 2013 · 1878a1b · 1878a1b
2 parents e7fee25 + d059f70
commit 1878a1b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.11
+2.17.12
diff --git a/package/yast2-squid.changes b/package/yast2-squid.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 18 16:54:12 CEST 2013 - locilka@suse.com
+
+- Do not block squid configuration if SuSEfirewall can't be read
+  (bnc#808722)
+- 2.17.12
+
 -------------------------------------------------------------------
 Fri Feb 26 12:28:31 CET 2010 - jsrain@suse.cz
 

diff --git a/src/Squid.ycp b/src/Squid.ycp
@@ -1061,8 +1061,9 @@ global boolean Read() {
 
     Progress::set(false);
     if (!SuSEFirewall::Read()){
-        ok = false;
-        Report::Error(_("Cannot read firewall settings."));
+        // bnc#808722: yast2 squid fail if SuSEfirewall in not installed
+        // other or no firewall can be installed
+        y2warning("Cannot read firewall settings.");
     }
     Progress::set(true);
     Progress::NextStage();

diff --git a/yast2-squid.spec.in b/yast2-squid.spec.in
@@ -10,7 +10,7 @@ BuildRequires: yast2-testsuite yast2-core-devel boost-devel gcc-c++
 Summary:	Configuration of squid
 
 %description
--
+Configuration of squid
 
 @PREP@