1 files changed, 45 insertions, 49 deletions

diff --git a/bitbake/lib/bb/fetch/ssh.py b/bitbake/lib/bb/fetch/ssh.py
index 57874d5ba9..e5f69e33e7 100644
--- a/bitbake/lib/bb/fetch/ssh.py
+++ b/bitbake/lib/bb/fetch/ssh.py
@@ -64,59 +64,55 @@ __pattern__ = re.compile(r'''
 class SSH(Fetch):
     '''Class to fetch a module or modules via Secure Shell'''
 
-    def supports(self, url, d):
+    def supports(self, url, urldata, d):
         return __pattern__.match(url) != None
 
-    def localpath(self, url, d):
+    def localpath(self, url, urldata, d):
         m = __pattern__.match(url)
         path = m.group('path')
         host = m.group('host')
-        lpath = os.path.join(data.getVar('DL_DIR', d, 1), host, os.path.basename(path))
+        lpath = os.path.join(data.getVar('DL_DIR', d, True), host, os.path.basename(path))
         return lpath
 
-    def go(self, d, urls = []):
-        if not urls:
-            urls = self.urls
-
-        for url in urls:
-            dldir = data.getVar('DL_DIR', d, 1)
-
-            m = __pattern__.match(url)
-            path = m.group('path')
-            host = m.group('host')
-            port = m.group('port')
-            user = m.group('user')
-            password = m.group('pass')
-
-            ldir = os.path.join(dldir, host)
-            lpath = os.path.join(ldir, os.path.basename(path))
-
-            if not os.path.exists(ldir):
-                os.makedirs(ldir)
-
-            if port:
-                port = '-P %s' % port
-            else:
-                port = ''
-
-            if user:
-                fr = user
-                if password:
-                    fr += ':%s' % password
-                fr += '@%s' % host
-            else:
-                fr = host
-            fr += ':%s' % path
-
-
-            import commands
-            cmd = 'scp -B -r %s %s %s/' % (
-                port,
-                commands.mkarg(fr),
-                commands.mkarg(ldir)
-            )
-
-            (exitstatus, output) = commands.getstatusoutput(cmd)
-            if exitstatus != 0:
-                print output
-                raise FetchError('Unable to fetch %s' % url)
+    def go(self, url, urldata, d):
+        dldir = data.getVar('DL_DIR', d, 1)
+
+        m = __pattern__.match(url)
+        path = m.group('path')
+        host = m.group('host')
+        port = m.group('port')
+        user = m.group('user')
+        password = m.group('pass')
+
+        ldir = os.path.join(dldir, host)
+        lpath = os.path.join(ldir, os.path.basename(path))
+
+        if not os.path.exists(ldir):
+            os.makedirs(ldir)
+
+        if port:
+            port = '-P %s' % port
+        else:
+            port = ''
+
+        if user:
+            fr = user
+            if password:
+                fr += ':%s' % password
+            fr += '@%s' % host
+        else:
+            fr = host
+        fr += ':%s' % path
+
+
+        import commands
+        cmd = 'scp -B -r %s %s %s/' % (
+            port,
+            commands.mkarg(fr),
+            commands.mkarg(ldir)
+        )
+
+        (exitstatus, output) = commands.getstatusoutput(cmd)
+        if exitstatus != 0:
+            print output
+            raise FetchError('Unable to fetch %s' % url)