onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-25 20:57:29 +01:00
Code Issues Releases Wiki Activity

bug #2474949

Browse Source
This commit is contained in:
Vadim Kurland 2008-12-30 02:55:58 +00:00
parent 1fb523806b
commit e580398e84
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 719
#define BUILD_NUM 720

5
doc/ChangeLog
View File

@ -1,5 +1,10 @@
2008-12-29 vadim <vadim@vk.crocodile.org>
* FirewallInstallerUnx.cpp (FirewallInstallerUnx::executeInstallScript)
bug #2474949: "External install script: trailing spaces". Trimming
leading and trailing white spaces in the external installation script
and its arguments before running it.
* runqmake.sh: starting with v3.0.4 build 717, building universal
binary for Mac OS X (both x86 and ppc architectures)

8
src/gui/FirewallInstallerUnx.cpp
View File

@ -169,14 +169,14 @@ void FirewallInstallerUnx::executeInstallScript()
{
Management *mgmt = cnf->fwobj->getManagementObject();
assert(mgmt!=NULL);
PolicyInstallScript *pis = mgmt->getPolicyInstallScript();
PolicyInstallScript *pis = mgmt->getPolicyInstallScript();
QString command = pis->getCommand().c_str();
QString wdir = getFileDir( mw->getRCS()->getFileName() );
QStringList args;
args.push_back(pis->getCommand().c_str());
args.push_back(command.trimmed());
QString qs = pis->getArguments().c_str();
args += qs.split(" ", QString::SkipEmptyParts);
args += qs.trimmed().split(" ", QString::SkipEmptyParts);
args.push_back("-f");
args.push_back(mw->db()->getFileName().c_str());