55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
|
From 814f6498d2487e57840ec93e5a206e39731044d8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Sutter <phil@nwl.cc>
|
||
|
|
Date: Thu, 12 Aug 2021 19:14:13 +0200
|
||
|
|
Subject: [PATCH] tests: iptables-test: Print errors to stderr
|
||
|
|
|
||
|
|
No big deal, just pass the extra parameter to the four error print
|
||
|
|
calls.
|
||
|
|
|
||
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
||
|
|
(cherry picked from commit a8da71864d467c4371dc24cd763fa2c1dfb6cfbb)
|
||
|
|
---
|
||
|
|
iptables-test.py | 9 +++++----
|
||
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/iptables-test.py b/iptables-test.py
|
||
|
|
index ffe5b1f7da972..06b9937bbf0e5 100755
|
||
|
|
--- a/iptables-test.py
|
||
|
|
+++ b/iptables-test.py
|
||
|
|
@@ -47,7 +47,7 @@ log_file = None
|
||
|
|
Prints an error with nice colors, indicating file and line number.
|
||
|
|
'''
|
||
|
|
print(filename + ": " + Colors.RED + "ERROR" +
|
||
|
|
- Colors.ENDC + ": line %d (%s)" % (lineno, reason))
|
||
|
|
+ Colors.ENDC + ": line %d (%s)" % (lineno, reason), file=sys.stderr)
|
||
|
|
|
||
|
|
|
||
|
|
def delete_rule(iptables, rule, filename, lineno):
|
||
|
|
@@ -365,11 +365,12 @@ log_file = None
|
||
|
|
EXECUTEABLE = "xtables-nft-multi"
|
||
|
|
|
||
|
|
if os.getuid() != 0:
|
||
|
|
- print("You need to be root to run this, sorry")
|
||
|
|
+ print("You need to be root to run this, sorry", file=sys.stderr)
|
||
|
|
return
|
||
|
|
|
||
|
|
if not args.netns and not args.no_netns and not spawn_netns():
|
||
|
|
- print("Cannot run in own namespace, connectivity might break")
|
||
|
|
+ print("Cannot run in own namespace, connectivity might break",
|
||
|
|
+ file=sys.stderr)
|
||
|
|
|
||
|
|
if not args.host:
|
||
|
|
os.putenv("XTABLES_LIBDIR", os.path.abspath(EXTENSIONS_PATH))
|
||
|
|
@@ -385,7 +386,7 @@ log_file = None
|
||
|
|
try:
|
||
|
|
log_file = open(LOGFILE, 'w')
|
||
|
|
except IOError:
|
||
|
|
- print("Couldn't open log file %s" % LOGFILE)
|
||
|
|
+ print("Couldn't open log file %s" % LOGFILE, file=sys.stderr)
|
||
|
|
return
|
||
|
|
|
||
|
|
if args.filename:
|
||
|
|
--
|
||
|
|
2.40.0
|
||
|
|
|