From e2f05c1e0a78c10bf43a8548b34ddfb80f69f223 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sun, 6 Feb 2011 19:34:09 -0800 Subject: [PATCH] see #2049 Installer reports success even if there was an error while creating static routes; new build 3462 --- VERSION | 2 +- VERSION.h | 2 +- doc/ChangeLog | 5 +++++ packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- src/libgui/SSHUnx.cpp | 2 ++ src/libgui/SSHUnx.h | 1 + 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 6aecdb221..53545e68d 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3461" +BUILD_NUM="3462" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 1fe18f3f9..4f55929f2 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3461" +#define VERSION "4.2.0.3462" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index 842a8b869..23133f26d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,10 @@ 2011-02-06 vadim + * SSHUnx.cpp (SSHUnx): fixes #2049 "Installer reports success even + if there was an error while creating static routes". Added our own + error message generated when command used to add static route + fails to the list of error messages recognized by the installer. + * OSConfigurator_freebsd.cpp (updateBridgeOfInterface): see #1889, #2043 Added support for bridge interface configuration in BSD. diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 1a8f2c417..891b462de 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.0.3461 +%define version 4.2.0.3462 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index afe14b57d..bcce6af2d 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 4.2.0.3461-1 +Version: 4.2.0.3462-1 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index e72b20b45..c703146aa 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3461 +%define version 4.2.0.3462 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/libgui/SSHUnx.cpp b/src/libgui/SSHUnx.cpp index 2d977b361..0ed3ff0e1 100644 --- a/src/libgui/SSHUnx.cpp +++ b/src/libgui/SSHUnx.cpp @@ -83,6 +83,7 @@ SSHUnx::SSHUnx(QWidget *_par, pfctl_errors << "error setting skip interface(s)"; pfctl_errors << "errors in altq config"; + route_add_errors << "Error: Routing rule .* couldn't be activated"; } SSHUnx::~SSHUnx() @@ -130,6 +131,7 @@ bool SSHUnx::checkForErrors() if (checkForErrors(&iptables_errors)) return true; if (checkForErrors(&pfctl_errors)) return true; + if (checkForErrors(&route_add_errors)) return true; return false; } diff --git a/src/libgui/SSHUnx.h b/src/libgui/SSHUnx.h index b6b73adbf..df3e0ee84 100644 --- a/src/libgui/SSHUnx.h +++ b/src/libgui/SSHUnx.h @@ -42,6 +42,7 @@ class SSHUnx : public SSHSession { QStringList iptables_errors; QStringList pfctl_errors; + QStringList route_add_errors; public: