Changeset a2ca699 for fedd/federation/desktop_access.py

Timestamp:

Mar 10, 2014 4:25:32 PM (10 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

8fbef04

Parents:

4a02274 (diff), e1ed2a7b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into shared_nat

File:

• fedd/federation/desktop_access.py (modified) (1 diff)

fedd/federation/desktop_access.py

@@ -415 +415 @@
             # a file this end can access into its local file system.  Try once
             # a minute.
-            print >>f,'while ! /usr/bin/scp -o "StrictHostKeyChecking no" -i %s %s:/usr/local/federation/etc/prep_done /dev/null; do' % (self.ssh_identity, peer)
+            print >>f,'while ! /usr/bin/scp -P %s -o "StrictHostKeyChecking no" -i %s %s:/usr/local/federation/etc/prep_done /dev/null; do' % (port, self.ssh_identity, peer)
             print >>f, 'sleep 60; done'
             print >>f, ('ssh -w 0:0 -p %s -o "Tunnel ethernet" ' + \