commit 7b203b0b235cb0bfcda284c3406c881aa7a53acd Author: c c@chroniko.jp Date: Sat Aug 22 11:24:55 2020 +0000
TorNet: Use %s rather than %r for Paths
For #40012 --- lib/chutney/TorNet.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index e3aca65..fa6f6aa 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2137,7 +2137,7 @@ class TorEnviron(chutney.Templating.Environ): hostname = hostname.strip() my['hs-hostname'] = hostname except IOError as e: - print("Error: hs %r error %d: %r opening hostname file '%r'" % + print("Error: hs %r error %d: %r opening hostname file '%s'" % (my['nick'], e.errno, e.strerror, hs_hostname_file)) return my['hs-hostname']
@@ -2224,7 +2224,7 @@ class Network(object): # subtract 1 second to avoid collisions and get the correct ordering newdir = get_new_absolute_nodes_path(time.time() - 1)
- print("NOTE: renaming %r to %r" % (nodesdir, newdir)) + print("NOTE: renaming '%s' to '%s'" % (nodesdir, newdir)) nodesdir.rename(newdir)
def create_new_nodes_dir(self): @@ -2251,7 +2251,7 @@ class Network(object): 'is not a link')
# create the new, uniquely named directory, and link it to nodes - print("NOTE: creating %r, linking to %r" % (newnodesdir, nodeslink)) + print("NOTE: creating '%s', linking to '%s'" % (newnodesdir, nodeslink)) # this gets created with mode 0700, that's probably ok mkdir_p(newnodesdir) try: