Dolda2000 GitWeb
/
pdm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b4cc75d
)
Added a client resolve syntax for connecting to remote Unix sockets.
author
Fredrik Tolf
<fredrik@dolda2000.com>
Sun, 15 Jan 2012 06:49:33 +0000
(07:49 +0100)
committer
Fredrik Tolf
<fredrik@dolda2000.com>
Sun, 15 Jan 2012 06:49:33 +0000
(07:49 +0100)
pdm/cli.py
patch
|
blob
|
blame
|
history
diff --git
a/pdm/cli.py
b/pdm/cli.py
index
effe3c9
..
1d83920
100644
(file)
--- a/
pdm/cli.py
+++ b/
pdm/cli.py
@@
-19,16
+19,21
@@
def resolve(spec):
return spec
sk = None
try:
return spec
sk = None
try:
- if "/" in spec:
+ if ":" in spec:
+ p = spec.rindex(":")
+ first, second = spec[:p], spec[p + 1:]
+ if "/" in second:
+ import sshsock
+ sk = sshsock.sshsocket(first, second)
+ else:
+ sk = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ sk.connect((first, second))
+ elif "/" in spec:
sk = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
sk.connect(spec)
elif spec.isdigit():
sk = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sk.connect(("localhost", int(spec)))
sk = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
sk.connect(spec)
elif spec.isdigit():
sk = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sk.connect(("localhost", int(spec)))
- elif ":" in spec:
- sk = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- p = spec.rindex(":")
- sk.connect((spec[:p], int(spec[p + 1:])))
else:
raise Exception("Unknown target specification %r" % spec)
rv = sk
else:
raise Exception("Unknown target specification %r" % spec)
rv = sk