summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py8
-rw-r--r--bitbake/lib/bb/fetch2/bzr.py4
-rw-r--r--bitbake/lib/bb/fetch2/cvs.py4
-rw-r--r--bitbake/lib/bb/fetch2/git.py4
-rw-r--r--bitbake/lib/bb/fetch2/hg.py4
-rw-r--r--bitbake/lib/bb/fetch2/local.py4
-rw-r--r--bitbake/lib/bb/fetch2/osc.py6
-rw-r--r--bitbake/lib/bb/fetch2/perforce.py4
-rw-r--r--bitbake/lib/bb/fetch2/repo.py4
-rw-r--r--bitbake/lib/bb/fetch2/ssh.py4
-rw-r--r--bitbake/lib/bb/fetch2/svk.py4
-rw-r--r--bitbake/lib/bb/fetch2/svn.py4
-rw-r--r--bitbake/lib/bb/fetch2/wget.py4
13 files changed, 29 insertions, 29 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index bdec67776f..b60ed0ce67 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -587,7 +587,7 @@ class FetchData(object):
587 self.localpath = None 587 self.localpath = None
588 self.lockfile = None 588 self.lockfile = None
589 (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d)) 589 (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d))
590 self.date = Fetch.getSRCDate(self, d) 590 self.date = FetchMethod.getSRCDate(self, d)
591 self.url = url 591 self.url = url
592 if not self.user and "user" in self.parm: 592 if not self.user and "user" in self.parm:
593 self.user = self.parm["user"] 593 self.user = self.parm["user"]
@@ -618,7 +618,7 @@ class FetchData(object):
618 if self.method.supports_srcrev(): 618 if self.method.supports_srcrev():
619 self.revisions = {} 619 self.revisions = {}
620 for name in self.names: 620 for name in self.names:
621 self.revisions[name] = Fetch.srcrev_internal_helper(self, d, name) 621 self.revisions[name] = FetchMethod.srcrev_internal_helper(self, d, name)
622 622
623 # add compatibility code for non name specified case 623 # add compatibility code for non name specified case
624 if len(self.names) == 1: 624 if len(self.names) == 1:
@@ -645,7 +645,7 @@ class FetchData(object):
645 self.localpath = self.method.localpath(self.url, self, d) 645 self.localpath = self.method.localpath(self.url, self, d)
646 646
647 647
648class Fetch(object): 648class FetchMethod(object):
649 """Base class for 'fetch'ing data""" 649 """Base class for 'fetch'ing data"""
650 650
651 def __init__(self, urls = []): 651 def __init__(self, urls = []):
@@ -893,7 +893,7 @@ class Fetch(object):
893 uselocalcount = bb.data.getVar("BB_LOCALCOUNT_OVERRIDE", d, True) or False 893 uselocalcount = bb.data.getVar("BB_LOCALCOUNT_OVERRIDE", d, True) or False
894 count = None 894 count = None
895 if uselocalcount: 895 if uselocalcount:
896 count = Fetch.localcount_internal_helper(ud, d, name) 896 count = FetchMethod.localcount_internal_helper(ud, d, name)
897 if count is None: 897 if count is None:
898 count = localcounts[key + '_count'] or "0" 898 count = localcounts[key + '_count'] or "0"
899 899
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py
index 22168a8351..e69bc4c8ec 100644
--- a/bitbake/lib/bb/fetch2/bzr.py
+++ b/bitbake/lib/bb/fetch2/bzr.py
@@ -28,9 +28,9 @@ import sys
28import logging 28import logging
29import bb 29import bb
30from bb import data 30from bb import data
31from bb.fetch2 import Fetch, FetchError, runfetchcmd, logger 31from bb.fetch2 import FetchMethod, FetchError, runfetchcmd, logger
32 32
33class Bzr(Fetch): 33class Bzr(FetchMethod):
34 def supports(self, url, ud, d): 34 def supports(self, url, ud, d):
35 return ud.type in ['bzr'] 35 return ud.type in ['bzr']
36 36
diff --git a/bitbake/lib/bb/fetch2/cvs.py b/bitbake/lib/bb/fetch2/cvs.py
index d792328c25..b440ed7b17 100644
--- a/bitbake/lib/bb/fetch2/cvs.py
+++ b/bitbake/lib/bb/fetch2/cvs.py
@@ -30,9 +30,9 @@ import os
30import logging 30import logging
31import bb 31import bb
32from bb import data 32from bb import data
33from bb.fetch2 import Fetch, FetchError, MissingParameterError, logger 33from bb.fetch2 import FetchMethod, FetchError, MissingParameterError, logger
34 34
35class Cvs(Fetch): 35class Cvs(FetchMethod):
36 """ 36 """
37 Class to fetch a module or modules from cvs repositories 37 Class to fetch a module or modules from cvs repositories
38 """ 38 """
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 1ae1d40302..38e2c93be4 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -23,11 +23,11 @@ BitBake 'Fetch' git implementation
23import os 23import os
24import bb 24import bb
25from bb import data 25from bb import data
26from bb.fetch2 import Fetch 26from bb.fetch2 import FetchMethod
27from bb.fetch2 import runfetchcmd 27from bb.fetch2 import runfetchcmd
28from bb.fetch2 import logger 28from bb.fetch2 import logger
29 29
30class Git(Fetch): 30class Git(FetchMethod):
31 """Class to fetch a module or modules from git repositories""" 31 """Class to fetch a module or modules from git repositories"""
32 def init(self, d): 32 def init(self, d):
33 # 33 #
diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py
index ffede8cf5a..d186b009dd 100644
--- a/bitbake/lib/bb/fetch2/hg.py
+++ b/bitbake/lib/bb/fetch2/hg.py
@@ -29,13 +29,13 @@ import sys
29import logging 29import logging
30import bb 30import bb
31from bb import data 31from bb import data
32from bb.fetch2 import Fetch 32from bb.fetch2 import FetchMethod
33from bb.fetch2 import FetchError 33from bb.fetch2 import FetchError
34from bb.fetch2 import MissingParameterError 34from bb.fetch2 import MissingParameterError
35from bb.fetch2 import runfetchcmd 35from bb.fetch2 import runfetchcmd
36from bb.fetch2 import logger 36from bb.fetch2 import logger
37 37
38class Hg(Fetch): 38class Hg(FetchMethod):
39 """Class to fetch from mercurial repositories""" 39 """Class to fetch from mercurial repositories"""
40 def supports(self, url, ud, d): 40 def supports(self, url, ud, d):
41 """ 41 """
diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py
index 56b20e56d3..7b840a46d3 100644
--- a/bitbake/lib/bb/fetch2/local.py
+++ b/bitbake/lib/bb/fetch2/local.py
@@ -29,9 +29,9 @@ import os
29import bb 29import bb
30import bb.utils 30import bb.utils
31from bb import data 31from bb import data
32from bb.fetch2 import Fetch 32from bb.fetch2 import FetchMethod
33 33
34class Local(Fetch): 34class Local(FetchMethod):
35 def supports(self, url, urldata, d): 35 def supports(self, url, urldata, d):
36 """ 36 """
37 Check to see if a given url represents a local fetch. 37 Check to see if a given url represents a local fetch.
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py
index 9b97cf1cc7..5c3a6fea68 100644
--- a/bitbake/lib/bb/fetch2/osc.py
+++ b/bitbake/lib/bb/fetch2/osc.py
@@ -11,12 +11,12 @@ import sys
11import logging 11import logging
12import bb 12import bb
13from bb import data 13from bb import data
14from bb.fetch2 import Fetch 14from bb.fetch2 import FetchMethod
15from bb.fetch2 import FetchError 15from bb.fetch2 import FetchError
16from bb.fetch2 import MissingParameterError 16from bb.fetch2 import MissingParameterError
17from bb.fetch2 import runfetchcmd 17from bb.fetch2 import runfetchcmd
18 18
19class Osc(Fetch): 19class Osc(FetchMethod):
20 """Class to fetch a module or modules from Opensuse build server 20 """Class to fetch a module or modules from Opensuse build server
21 repositories.""" 21 repositories."""
22 22
@@ -41,7 +41,7 @@ class Osc(Fetch):
41 ud.revision = ud.parm['rev'] 41 ud.revision = ud.parm['rev']
42 else: 42 else:
43 pv = data.getVar("PV", d, 0) 43 pv = data.getVar("PV", d, 0)
44 rev = Fetch.srcrev_internal_helper(ud, d) 44 rev = FetchMethod.srcrev_internal_helper(ud, d)
45 if rev and rev != True: 45 if rev and rev != True:
46 ud.revision = rev 46 ud.revision = rev
47 else: 47 else:
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py
index e98440f59f..583dfb93bf 100644
--- a/bitbake/lib/bb/fetch2/perforce.py
+++ b/bitbake/lib/bb/fetch2/perforce.py
@@ -30,11 +30,11 @@ import os
30import logging 30import logging
31import bb 31import bb
32from bb import data 32from bb import data
33from bb.fetch2 import Fetch 33from bb.fetch2 import FetchMethod
34from bb.fetch2 import FetchError 34from bb.fetch2 import FetchError
35from bb.fetch2 import logger 35from bb.fetch2 import logger
36 36
37class Perforce(Fetch): 37class Perforce(FetchMethod):
38 def supports(self, url, ud, d): 38 def supports(self, url, ud, d):
39 return ud.type in ['p4'] 39 return ud.type in ['p4']
40 40
diff --git a/bitbake/lib/bb/fetch2/repo.py b/bitbake/lib/bb/fetch2/repo.py
index 9d890a5e94..3b16fc0144 100644
--- a/bitbake/lib/bb/fetch2/repo.py
+++ b/bitbake/lib/bb/fetch2/repo.py
@@ -26,10 +26,10 @@ BitBake "Fetch" repo (git) implementation
26import os 26import os
27import bb 27import bb
28from bb import data 28from bb import data
29from bb.fetch2 import Fetch 29from bb.fetch2 import FetchMethod
30from bb.fetch2 import runfetchcmd 30from bb.fetch2 import runfetchcmd
31 31
32class Repo(Fetch): 32class Repo(FetchMethod):
33 """Class to fetch a module or modules from repo (git) repositories""" 33 """Class to fetch a module or modules from repo (git) repositories"""
34 def supports(self, url, ud, d): 34 def supports(self, url, ud, d):
35 """ 35 """
diff --git a/bitbake/lib/bb/fetch2/ssh.py b/bitbake/lib/bb/fetch2/ssh.py
index 29cc272193..8b07b3a710 100644
--- a/bitbake/lib/bb/fetch2/ssh.py
+++ b/bitbake/lib/bb/fetch2/ssh.py
@@ -38,7 +38,7 @@ IETF secsh internet draft:
38 38
39import re, os 39import re, os
40from bb import data 40from bb import data
41from bb.fetch2 import Fetch 41from bb.fetch2 import FetchMethod
42from bb.fetch2 import FetchError 42from bb.fetch2 import FetchError
43 43
44 44
@@ -61,7 +61,7 @@ __pattern__ = re.compile(r'''
61 $ 61 $
62''', re.VERBOSE) 62''', re.VERBOSE)
63 63
64class SSH(Fetch): 64class SSH(FetchMethod):
65 '''Class to fetch a module or modules via Secure Shell''' 65 '''Class to fetch a module or modules via Secure Shell'''
66 66
67 def supports(self, url, urldata, d): 67 def supports(self, url, urldata, d):
diff --git a/bitbake/lib/bb/fetch2/svk.py b/bitbake/lib/bb/fetch2/svk.py
index 8220bf3dc2..213d0d3ec4 100644
--- a/bitbake/lib/bb/fetch2/svk.py
+++ b/bitbake/lib/bb/fetch2/svk.py
@@ -29,12 +29,12 @@ import os
29import logging 29import logging
30import bb 30import bb
31from bb import data 31from bb import data
32from bb.fetch2 import Fetch 32from bb.fetch2 import FetchMethod
33from bb.fetch2 import FetchError 33from bb.fetch2 import FetchError
34from bb.fetch2 import MissingParameterError 34from bb.fetch2 import MissingParameterError
35from bb.fetch2 import logger 35from bb.fetch2 import logger
36 36
37class Svk(Fetch): 37class Svk(FetchMethod):
38 """Class to fetch a module or modules from svk repositories""" 38 """Class to fetch a module or modules from svk repositories"""
39 def supports(self, url, ud, d): 39 def supports(self, url, ud, d):
40 """ 40 """
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index 267c9bb7e6..ce86288903 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -28,13 +28,13 @@ import sys
28import logging 28import logging
29import bb 29import bb
30from bb import data 30from bb import data
31from bb.fetch2 import Fetch 31from bb.fetch2 import FetchMethod
32from bb.fetch2 import FetchError 32from bb.fetch2 import FetchError
33from bb.fetch2 import MissingParameterError 33from bb.fetch2 import MissingParameterError
34from bb.fetch2 import runfetchcmd 34from bb.fetch2 import runfetchcmd
35from bb.fetch2 import logger 35from bb.fetch2 import logger
36 36
37class Svn(Fetch): 37class Svn(FetchMethod):
38 """Class to fetch a module or modules from svn repositories""" 38 """Class to fetch a module or modules from svn repositories"""
39 def supports(self, url, ud, d): 39 def supports(self, url, ud, d):
40 """ 40 """
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index e33265e1cc..8e34b0c2bd 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -30,9 +30,9 @@ import logging
30import bb 30import bb
31import urllib 31import urllib
32from bb import data 32from bb import data
33from bb.fetch2 import Fetch, FetchError, encodeurl, decodeurl, logger, runfetchcmd 33from bb.fetch2 import FetchMethod, FetchError, encodeurl, decodeurl, logger, runfetchcmd
34 34
35class Wget(Fetch): 35class Wget(FetchMethod):
36 """Class to fetch urls via 'wget'""" 36 """Class to fetch urls via 'wget'"""
37 def supports(self, url, ud, d): 37 def supports(self, url, ud, d):
38 """ 38 """