[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[minion-cvs] Remove trailing space throughout.
Update of /home/minion/cvsroot/src/minion/lib/mixminion/directory
In directory moria.mit.edu:/tmp/cvs-serv28551/lib/mixminion/directory
Modified Files:
DirMain.py Directory.py ServerInbox.py ServerList.py
Log Message:
Remove trailing space throughout.
Index: DirMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/DirMain.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- DirMain.py 24 Nov 2003 19:59:04 -0000 1.19
+++ DirMain.py 28 Nov 2003 04:14:04 -0000 1.20
@@ -64,7 +64,7 @@
"""[Entry point] Set up a new set of directory files."""
if args:
raise UIError("mixminion dir initialize takes no arguments")
-
+
d = getDirectory()
d.setupDirectories()
d.getServerList()
@@ -76,7 +76,7 @@
as part of a cron job."""
if args:
raise UIError("mixminion dir update takes no arguments")
-
+
d = getDirectory()
serverList = d.getServerList()
inbox = d.getInbox()
@@ -159,7 +159,7 @@
now = time.time()
tomorrow = now+60*60*24
twoWeeks = 60*60*24*14
-
+
serverList.generateDirectory(startAt=now, endAt=tomorrow,
extraTime=twoWeeks,
identityKey=key,
@@ -196,7 +196,7 @@
'generate' : cmd_generate,
'fingerprint' : cmd_fingerprint,
'rebuildcache' : cmd_rebuildcache
- }
+ }
def main(cmd, args):
"""[Entry point] Multiplex among subcommands."""
Index: Directory.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/Directory.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Directory.py 20 Nov 2003 04:03:47 -0000 1.15
+++ Directory.py 28 Nov 2003 04:14:04 -0000 1.16
@@ -62,7 +62,7 @@
self.cache = None
self.inbox = None
self.serverList = None
-
+
def setupDirectories(self):
"""Create a new tree of dirs with appropriate permissions."""
me = os.getuid()
@@ -148,7 +148,7 @@
return key
else:
return mixminion.Crypto.pk_PEM_load(fname)
-
+
class DirectoryConfig(C._ConfigFile):
"""Configuration file for a directory server."""
_restrictFormat = 0
@@ -173,7 +173,7 @@
} }
def __init__(self, filename=None, string=None):
C._ConfigFile.__init__(self, filename, string)
-
+
def validate(self, lines, contents):
import pwd
import grp
@@ -312,13 +312,13 @@
raise MixError("Cache exists, but cannot read cache: %s" % e)
if len(obj) != 2:
raise MixFatalError("Corrupt ID cache")
-
+
typecode, data = obj
if typecode != 'V0':
raise MixFatalError("Unrecognized version on ID cache.")
self.cache = data
-
+
def save(self):
"""Write the cache to disk."""
if self.cache is None:
@@ -329,7 +329,7 @@
if self.postSave:
self.postSave()
self.dirty = 0
-
+
def getIDFingerprint(server):
"""Given a ServerInfo, return the fingerprint of its identity key.
Index: ServerInbox.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/ServerInbox.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ServerInbox.py 13 Jul 2003 03:45:34 -0000 1.11
+++ ServerInbox.py 28 Nov 2003 04:14:04 -0000 1.12
@@ -49,7 +49,7 @@
text -- a string containing a new server descriptor.
source -- a (human readable) string describing the source
of the descriptor, used in error messages.
-
+
"""
try:
server = ServerInfo(string=text,assumeValid=0)
@@ -156,7 +156,7 @@
if reject:
LOG.warn("Rejecting %s servers named %s with unmatched KeyIDs",
len(reject), nickname)
-
+
try:
serverList._lock()
serverList.learnServerID(incoming[0][1])
@@ -173,7 +173,7 @@
servers = {}
# lcnickname->nicknames
nicknames = {}
-
+
for fname,s,t,fp in incoming:
nickname = s.getNickname()
lcnickname = nickname.lower()
Index: ServerList.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/ServerList.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ServerList.py 24 Nov 2003 19:59:04 -0000 1.43
+++ ServerList.py 28 Nov 2003 04:14:04 -0000 1.44
@@ -89,7 +89,7 @@
# dir-dategenerated.N ...
# identity
# .lock
-
+
def __init__(self, baseDir, idCache=None):
"""Initialize a ServerList to store servers under baseDir/servers,
creating directories as needed.
@@ -247,7 +247,7 @@
"""Generate and sign a new directory, to be effective from <startAt>
through <endAt>. It includes all servers that are valid at
any time between <startAt> and <endAt>+<extraTime>. The directory
- is signed with <identityKey>.
+ is signed with <identityKey>.
Any servers whose nicknames appear in 'badServers' are marked as
not recommended; any servers whose nicknames appear in