[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[minion-cvs] Remove extraneous space
Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv533/lib/mixminion/server
Modified Files:
MMTPServer.py ServerKeys.py ServerMain.py ServerQueue.py
Log Message:
Remove extraneous space
Index: MMTPServer.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/MMTPServer.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- MMTPServer.py 6 Jun 2003 06:04:58 -0000 1.37
+++ MMTPServer.py 6 Jun 2003 06:08:39 -0000 1.38
@@ -427,7 +427,7 @@
if not self.__failed:
self.__failed = 1
self.handleFail(1)
- self.remove()
+ self.remove()
def handleRead(self):
self.__handleAll()
@@ -462,7 +462,7 @@
if not self.__failed:
self.__failed = 1
self.handleFail(retriable=1)
- self.remove()
+ self.remove()
except _ml.TLSError, e:
if self.__state != self.__shutdownFn:
warn("Unexpected error: %s. Closing connection to %s.",
@@ -704,7 +704,7 @@
# As described in the docstring for __init__ below. We remove entries
# from the front of messageList/handleList as we begin sending them.
# _curMessage, _curHandle: Correspond to the message and handle
- # that we are currently trying to deliver.
+ # that we are currently trying to deliver.
# junk: A list of 32KB padding chunks that we're going to send. We
# pregenerate these to avoid timing attacks. They correspond to
# the 'JUNK' entries in messageList.
Index: ServerKeys.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerKeys.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ServerKeys.py 6 Jun 2003 06:04:58 -0000 1.40
+++ ServerKeys.py 6 Jun 2003 06:08:40 -0000 1.41
@@ -489,7 +489,7 @@
LOG.info("Next key event: new key becomes valid at %s",
formatTime(self.nextUpdate,1))
- return self.nextUpdate
+ return self.nextUpdate
def getAddress(self):
"""Return out current ip/port/keyid tuple"""
@@ -1093,4 +1093,3 @@
identityCertText = readFile(fname)
os.unlink(fname)
writeFile(filename, certText+identityCertText, 0600)
-
Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- ServerMain.py 6 Jun 2003 06:04:58 -0000 1.74
+++ ServerMain.py 6 Jun 2003 06:08:40 -0000 1.75
@@ -1114,7 +1114,7 @@
old, remove all the old keys and server descriptors, clean out the
queues, and mark the directory as up-to-date."""
- config = configFromServerArgs(cmd, args, usage=_UPGRADE_USAGE)
+ config = configFromServerArgs(cmd, args, usage=_UPGRADE_USAGE)
assert config
mixminion.Common.configureShredCommand(config)
@@ -1154,7 +1154,7 @@
_ = keyset.getServerDescriptor()
keep += 1
except mixminion.Config.ConfigError, e:
- errors += 1
+ errors += 1
if str(e).startswith("Unrecognized descriptor version: 0.1"):
print "Removing old keyset %s"%keyset.keyname
keyset.delete()
@@ -1315,7 +1315,7 @@
the server."""
config = configFromServerArgs(cmd, args, usage=_REPUBLISH_USAGE)
- checkHomedirVersion(config)
+ checkHomedirVersion(config)
LOG.setMinSeverity("INFO")
mixminion.Crypto.init_crypto(config)
Index: ServerQueue.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerQueue.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ServerQueue.py 6 Jun 2003 06:04:58 -0000 1.21
+++ ServerQueue.py 6 Jun 2003 06:08:40 -0000 1.22
@@ -614,7 +614,7 @@
self._deliverMessages(messages)
self._repOk()
- # FFFF005 This interface is inefficient in space: we don't need to load
+ # FFFF005 This interface is inefficient in space: we don't need to load
# FFFF005 the messages to tell whether they need to be delivered. We
# FFFF005 should have _deliverMessages() take a list of handles, not of
# FFFF005 messages.