summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-07-29 12:21:29 +0100
committerLars Wirzenius <liw@liw.fi>2011-07-29 12:21:29 +0100
commit631d17eadd2b7712a2607579217a4156d308b33f (patch)
tree65dbb6d711bbf4a92a15dd5d6af9d5c2cb8898f2
parent663b56671d4b476770b3d8491eb8c9ba5d250bb8 (diff)
downloadobnam-631d17eadd2b7712a2607579217a4156d308b33f.tar.gz
Handle sftp URLs in verify plugin.
-rw-r--r--obnamlib/plugins/verify_plugin.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/obnamlib/plugins/verify_plugin.py b/obnamlib/plugins/verify_plugin.py
index 2acc4e93..eb4bbf8d 100644
--- a/obnamlib/plugins/verify_plugin.py
+++ b/obnamlib/plugins/verify_plugin.py
@@ -18,6 +18,7 @@ import logging
import os
import stat
import sys
+import urlparse
import obnamlib
@@ -54,12 +55,17 @@ class VerifyPlugin(obnamlib.ObnamPlugin):
self.repo.open_client(self.app.settings['client-name'])
self.fs = self.app.fsf.new(args[0])
self.fs.connect()
- self.fs.reinit('/')
+ t = urlparse.urlparse(args[0])
+ root_url = urlparse.urlunparse((t[0], t[1], '/', t[3], t[4], t[5]))
+ logging.debug('t: %s' % repr(t))
+ logging.debug('root_url: %s' % repr(root_url))
+ self.fs.reinit(root_url)
self.failed = False
gen = self.repo.genspec(self.app.settings['generation'])
for arg in args:
- arg = os.path.normpath(arg)
+ scheme, netloc, path, query, fragment = urlparse.urlsplit(arg)
+ arg = os.path.normpath(path)
metadata = self.repo.get_metadata(gen, arg)
try:
if metadata.isdir():