diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-11-21 16:22:48 -0800 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-11-21 16:22:48 -0800 |
| commit | 04db01431daf4c35f3e8b02789ddf97803add803 (patch) | |
| tree | 034f0055bd3cfa8f9c7a0d22c60eda20a2a3f4f9 | |
| parent | 234449bd8c7269d30fde51985ab411c601b7a2a5 (diff) | |
| parent | de9a765a72e8e83428778d10e86750941a6241f1 (diff) | |
| download | vyatta-cfg-firewall-04db01431daf4c35f3e8b02789ddf97803add803.tar.gz vyatta-cfg-firewall-04db01431daf4c35f3e8b02789ddf97803add803.zip | |
Merge branch 'pacifica' of git.vyatta.com:/git/vyatta-cfg-firewall into pacifica
| -rw-r--r-- | debian/changelog | 25 | ||||
| -rwxr-xr-x | lib/Vyatta/IpTables/IpSet.pm | 4 |
2 files changed, 27 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 00125d2..944ed62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,31 @@ +vyatta-cfg-firewall (0.13.90+pacifica6) unstable; urgency=low + + [ Gaurav Sinha ] + * Fix rc usage as per ispet_delete and other commands + * Revert "Merge branch 'pacifica' of git.vyatta.com:/git/vyatta-cfg- + firewall into pacifica" + + [ John Southworth ] + * Bugfix 7613: cleanup firewall groups correctly + + [ Gaurav Sinha ] + * 0.13.90+pacifica5 + + -- Gaurav Sinha <gaurav.sinha@vyatta.com> Tue, 20 Nov 2012 10:36:08 -0800 + vyatta-cfg-firewall (0.13.90+pacifica5) unstable; urgency=low + [ Gaurav Sinha ] + * Fix rc usage as per ispet_delete and other commands + * Revert "Merge branch 'pacifica' of git.vyatta.com:/git/vyatta-cfg- + firewall into pacifica" + + [ John Southworth ] * Bugfix 7613: cleanup firewall groups correctly - -- John Southworth <john.southworth@vyatta.com> Mon, 19 Nov 2012 13:14:59 -0800 + [ Gaurav Sinha ] + + -- Gaurav Sinha <gaurav.sinha@vyatta.com> Tue, 20 Nov 2012 10:35:59 -0800 vyatta-cfg-firewall (0.13.90+pacifica4) unstable; urgency=low diff --git a/lib/Vyatta/IpTables/IpSet.pm b/lib/Vyatta/IpTables/IpSet.pm index 729c58e..e64a5ff 100755 --- a/lib/Vyatta/IpTables/IpSet.pm +++ b/lib/Vyatta/IpTables/IpSet.pm @@ -280,7 +280,9 @@ sub reset_ipset { } else { $self->reset_ipset_named(); } - $self->run_cmd($unlockcmd); + my $rc = $self->run_cmd($unlockcmd); + return "Error: call to ipset failed [$rc]" if $rc; + return; # undef } sub delete { |