##// END OF EJS Templates
py3: mask out None type when printing in `debuglocks`...
Matt Harbison -
r39920:9c8eff5c default
parent child Browse files
Show More
@@ -1436,10 +1436,10 b' def debuglocks(ui, repo, **opts):'
1436 if ":" in locker:
1436 if ":" in locker:
1437 host, pid = locker.split(':')
1437 host, pid = locker.split(':')
1438 if host == socket.gethostname():
1438 if host == socket.gethostname():
1439 locker = 'user %s, process %s' % (user, pid)
1439 locker = 'user %s, process %s' % (user or b'None', pid)
1440 else:
1440 else:
1441 locker = 'user %s, process %s, host %s' \
1441 locker = 'user %s, process %s, host %s' \
1442 % (user, pid, host)
1442 % (user or b'None', pid, host)
1443 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
1443 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
1444 return 1
1444 return 1
1445 except OSError as e:
1445 except OSError as e:
General Comments 0
You need to be logged in to leave comments. Login now