[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/directory
In directory moria.mit.edu:/tmp/cvs-serv533/lib/mixminion/directory
Modified Files:
DirCGI.py Directory.py ServerInbox.py ServerList.py
Log Message:
Remove extraneous space
Index: DirCGI.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/DirCGI.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DirCGI.py 28 May 2003 08:37:48 -0000 1.6
+++ DirCGI.py 6 Jun 2003 06:08:39 -0000 1.7
@@ -54,5 +54,3 @@
print "Status: 0\nMessage: %s"%e
except ServerQueuedException, e:
print "Status: 1\nMessage: %s"%e
-
-
Index: Directory.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/Directory.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Directory.py 6 Jun 2003 06:04:58 -0000 1.10
+++ Directory.py 6 Jun 2003 06:08:39 -0000 1.11
@@ -156,7 +156,7 @@
_syntax = {
'Host' : C.ClientConfig._syntax['Host'],
"Directory-Store" : {
- "__SECTION__" : ("REQUIRE", None, None ),
+ "__SECTION__" : ("REQUIRE", None, None ),
"Homedir" : ('REQUIRE', C._parseFilename, None),
"DirUser" : ('REQUIRE', None, None),
"CGIUser" : ('REQUIRE', None, None),
Index: ServerInbox.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/ServerInbox.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ServerInbox.py 6 Jun 2003 06:04:58 -0000 1.8
+++ ServerInbox.py 6 Jun 2003 06:08:39 -0000 1.9
@@ -78,7 +78,7 @@
LOG.info("Received update for server %s from %s",
nickname, source)
self.updateQueue.queueIncomingServer(text,server)
- return 1
+ return 1
def _doAccept(self, serverList, q, incoming, reject, knownOnly):
"""Helper function: move servers from an IncomingQueue into
@@ -94,7 +94,7 @@
known identity keys?
"""
accepted = []
- for fname, server, text, fp in incoming:
+ for fname, server, text, fp in incoming:
try:
serverList.importServerInfo(text,server=server,
knownOnly=knownOnly)
@@ -184,7 +184,7 @@
sorted.sort()
if not sorted:
print >>f, "No incoming descriptors"
- return
+ return
maxlen = max([len(n) for n in sorted])
format = " %"+str(maxlen)+"s:%s [%s descriptors]"
for lcnickname in sorted:
Index: ServerList.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/ServerList.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ServerList.py 6 Jun 2003 06:04:58 -0000 1.30
+++ ServerList.py 6 Jun 2003 06:08:39 -0000 1.31
@@ -336,7 +336,7 @@
assert foundDigests == includedDigests
writeFile(os.path.join(self.baseDir, "directory"),
- directory,
+ directory,
mode=0644)
f, _ = openUnique(os.path.join(self.dirArchiveDir,
@@ -486,4 +486,3 @@
# May raise ConfigError, MixError
return contents, ServerInfo(string=contents, assumeValid=0)
-