first remote commit test!!!

diff --git a/Demo/pdist/cmptree.py b/Demo/pdist/cmptree.py
index 84ed3f0b1911b55282f5f0ba54a57ae808eb3fe3..7eaa6c3697cbc8c32710b8d869c5a5adf9b56408 100755 (executable)
--- a/Demo/pdist/cmptree.py
+++ b/Demo/pdist/cmptree.py
@@ -35,7 +35,7 @@ d - delete disappearing files, either remote or local
        t2 = time.time()
        dt = t2-t1
        mins, secs = divmod(dt, 60)
-       print mins, "minutes and", secs, "seconds"
+       print mins, "minutes and", round(secs), "seconds"
        raw_input("[Return to exit] ")
 
 def ask(prompt, default):
@@ -103,6 +103,18 @@ def compare(local, remote, mode):
                        common.append(name)
                else:
                        print "Remote subdirectory", repr(name), "not found locally"
+                       if 'r' in mode and 'c' in mode:
+                               pr = "Create local subdirectory %s? [y] " % \
+                                    repr(name)
+                               if 'y' in mode:
+                                       ok = 'y'
+                               else:
+                                       ok = ask(pr, "y")
+                               if ok[:1] in ('y', 'Y'):
+                                       local.mkdir(name)
+                                       print "Subdirectory %s made" % \
+                                               repr(name)
+                                       common.append(name)
        lsubdirs = local.listsubdirs()
        for name in lsubdirs:
                if name not in subdirs:
@@ -135,12 +147,23 @@ def sendfile(local, remote, name):
        t2 = time.time()
        
        dt = t2-t1
-       print len(data), "bytes in", t2-t1, "seconds",
+       print len(data), "bytes in", round(dt), "seconds",
        if dt:
-               print "i.e.", len(data)/dt, "bytes/sec",
+               print "i.e.", round(len(data)/dt), "bytes/sec",
        print
 
 def recvfile(local, remote, name):
+       ok = 0
+       try:
+               rv = recvfile_real(local, remote, name)
+               ok = 1
+               return rv
+       finally:
+               if not ok:
+                       print "*** recvfile of %s failed, deleting" % `name`
+                       local.delete(name)
+
+def recvfile_real(local, remote, name):
        try:
                local.create(name)
        except (IOError, os.error), msg:
@@ -172,7 +195,7 @@ def recvfile(local, remote, name):
        f.close()
        
        dt = t2-t1
-       print size, "bytes in", dt, "seconds",
+       print size, "bytes in", round(dt), "seconds",
        if dt:
                print "i.e.", int(size/dt), "bytes/sec",
        print

diff --git a/Demo/pdist/server.py b/Demo/pdist/server.py
index 5d42abcf986727000b30f553ab050f4a4a6e2dd0..c8acf19103db968675febc69dac94851edc2175e 100755 (executable)
--- a/Demo/pdist/server.py
+++ b/Demo/pdist/server.py
@@ -58,7 +58,7 @@ class Server:
                        if self._verbose > 1: print "Wait for next request ..."
                        ok = self._dorequest(rf, wf)
        
-       _valid = ['192.16.201.*', '192.16.197.*']
+       _valid = ['192.16.201.*', '192.16.197.*', '132.151.1.*']
        
        def _verify(self, conn, address):
                host, port = address