From c64b445f38179a117d39319f762f9dc2435da0ea Mon Sep 17 00:00:00 2001
From: Yu Ke <ke.yu@intel.com>
Date: Mon, 10 Jan 2011 18:05:07 +0000
Subject: bb.fetch2: replace bb.fetch with bb.fetch2 in the bb.fetch
bb.fetch2 is copied from bb.fetch, and has many bb.fetch referrence.
Fix these referrence with bb.fetch2 referrence
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
bitbake/lib/bb/fetch2/__init__.py | 22 +++++++++++-----------
bitbake/lib/bb/fetch2/bzr.py | 2 +-
bitbake/lib/bb/fetch2/cvs.py | 2 +-
bitbake/lib/bb/fetch2/git.py | 8 ++++----
bitbake/lib/bb/fetch2/hg.py | 10 +++++-----
bitbake/lib/bb/fetch2/local.py | 2 +-
bitbake/lib/bb/fetch2/osc.py | 8 ++++----
bitbake/lib/bb/fetch2/perforce.py | 6 +++---
bitbake/lib/bb/fetch2/repo.py | 4 ++--
bitbake/lib/bb/fetch2/ssh.py | 4 ++--
bitbake/lib/bb/fetch2/svk.py | 8 ++++----
bitbake/lib/bb/fetch2/svn.py | 10 +++++-----
bitbake/lib/bb/fetch2/wget.py | 2 +-
13 files changed, 44 insertions(+), 44 deletions(-)
(limited to 'bitbake/lib')
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index f7153ebce..dd6f714d7 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -134,9 +134,9 @@ def uri_replace(uri, uri_find, uri_replace, d):
result_decoded[loc] = re.sub(i, uri_replace_decoded[loc], uri_decoded[loc])
if uri_find_decoded.index(i) == 2:
if d:
- localfn = bb.fetch.localpath(uri, d)
+ localfn = bb.fetch2.localpath(uri, d)
if localfn:
- result_decoded[loc] = os.path.join(os.path.dirname(result_decoded[loc]), os.path.basename(bb.fetch.localpath(uri, d)))
+ result_decoded[loc] = os.path.join(os.path.dirname(result_decoded[loc]), os.path.basename(bb.fetch2.localpath(uri, d)))
else:
return uri
return encodeurl(result_decoded)
@@ -158,7 +158,7 @@ def fetcher_init(d):
elif srcrev_policy == "clear":
logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy)
try:
- bb.fetch.saved_headrevs = pd['BB_URI_HEADREVS'].items()
+ bb.fetch2.saved_headrevs = pd['BB_URI_HEADREVS'].items()
except:
pass
del pd['BB_URI_HEADREVS']
@@ -177,7 +177,7 @@ def fetcher_compare_revisions(d):
pd = persist_data.persist(d)
data = pd['BB_URI_HEADREVS'].items()
- data2 = bb.fetch.saved_headrevs
+ data2 = bb.fetch2.saved_headrevs
changed = False
for key in data:
@@ -378,7 +378,7 @@ def get_srcrev(d):
#
# Neater solutions welcome!
#
- if bb.fetch.srcrev_internal_call:
+ if bb.fetch2.srcrev_internal_call:
return "SRCREVINACTION"
scms = []
@@ -494,7 +494,7 @@ def try_mirrors(d, uri, mirrors, check = False, force = False):
if newuri != uri:
try:
ud = FetchData(newuri, ld)
- except bb.fetch.NoMethodError:
+ except bb.fetch2.NoMethodError:
logger.debug(1, "No method for %s", uri)
continue
@@ -508,9 +508,9 @@ def try_mirrors(d, uri, mirrors, check = False, force = False):
else:
ud.method.go(newuri, ud, ld)
return ud.localpath
- except (bb.fetch.MissingParameterError,
- bb.fetch.FetchError,
- bb.fetch.MD5SumError):
+ except (bb.fetch2.MissingParameterError,
+ bb.fetch2.FetchError,
+ bb.fetch2.MD5SumError):
import sys
(type, value, traceback) = sys.exc_info()
logger.debug(2, "Mirror fetch failure: %s", value)
@@ -571,10 +571,10 @@ class FetchData(object):
self.localpath = local
if not local:
try:
- bb.fetch.srcrev_internal_call = True
+ bb.fetch2.srcrev_internal_call = True
self.localpath = self.method.localpath(self.url, self, d)
finally:
- bb.fetch.srcrev_internal_call = False
+ bb.fetch2.srcrev_internal_call = False
# We have to clear data's internal caches since the cached value of SRCREV is now wrong.
# Horrible...
bb.data.delVar("ISHOULDNEVEREXIST", d)
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py
index afaf79990..3d23b4d3c 100644
--- a/bitbake/lib/bb/fetch2/bzr.py
+++ b/bitbake/lib/bb/fetch2/bzr.py
@@ -28,7 +28,7 @@ import sys
import logging
import bb
from bb import data
-from bb.fetch import Fetch, FetchError, runfetchcmd, logger
+from bb.fetch2 import Fetch, FetchError, runfetchcmd, logger
class Bzr(Fetch):
def supports(self, url, ud, d):
diff --git a/bitbake/lib/bb/fetch2/cvs.py b/bitbake/lib/bb/fetch2/cvs.py
index 0edb794b0..1570cab9c 100644
--- a/bitbake/lib/bb/fetch2/cvs.py
+++ b/bitbake/lib/bb/fetch2/cvs.py
@@ -30,7 +30,7 @@ import os
import logging
import bb
from bb import data
-from bb.fetch import Fetch, FetchError, MissingParameterError, logger
+from bb.fetch2 import Fetch, FetchError, MissingParameterError, logger
class Cvs(Fetch):
"""
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index de415ec30..e8ad3b43c 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -23,9 +23,9 @@ BitBake 'Fetch' git implementation
import os
import bb
from bb import data
-from bb.fetch import Fetch
-from bb.fetch import runfetchcmd
-from bb.fetch import logger
+from bb.fetch2 import Fetch
+from bb.fetch2 import runfetchcmd
+from bb.fetch2 import logger
class Git(Fetch):
"""Class to fetch a module or modules from git repositories"""
@@ -225,7 +225,7 @@ class Git(Fetch):
cmd = "%s ls-remote %s://%s%s%s %s" % (basecmd, ud.proto, username, ud.host, ud.path, ud.branch)
output = runfetchcmd(cmd, d, True)
if not output:
- raise bb.fetch.FetchError("Fetch command %s gave empty output\n" % (cmd))
+ raise bb.fetch2.FetchError("Fetch command %s gave empty output\n" % (cmd))
return output.split()[0]
def _build_revision(self, url, ud, d):
diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py
index 3c649a6ad..9e91bec18 100644
--- a/bitbake/lib/bb/fetch2/hg.py
+++ b/bitbake/lib/bb/fetch2/hg.py
@@ -29,11 +29,11 @@ import sys
import logging
import bb
from bb import data
-from bb.fetch import Fetch
-from bb.fetch import FetchError
-from bb.fetch import MissingParameterError
-from bb.fetch import runfetchcmd
-from bb.fetch import logger
+from bb.fetch2 import Fetch
+from bb.fetch2 import FetchError
+from bb.fetch2 import MissingParameterError
+from bb.fetch2 import runfetchcmd
+from bb.fetch2 import logger
class Hg(Fetch):
"""Class to fetch from mercurial repositories"""
diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py
index 6aa9e4576..bcb30dfc9 100644
--- a/bitbake/lib/bb/fetch2/local.py
+++ b/bitbake/lib/bb/fetch2/local.py
@@ -29,7 +29,7 @@ import os
import bb
import bb.utils
from bb import data
-from bb.fetch import Fetch
+from bb.fetch2 import Fetch
class Local(Fetch):
def supports(self, url, urldata, d):
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py
index 26820967a..06ac5a9ce 100644
--- a/bitbake/lib/bb/fetch2/osc.py
+++ b/bitbake/lib/bb/fetch2/osc.py
@@ -11,10 +11,10 @@ import sys
import logging
import bb
from bb import data
-from bb.fetch import Fetch
-from bb.fetch import FetchError
-from bb.fetch import MissingParameterError
-from bb.fetch import runfetchcmd
+from bb.fetch2 import Fetch
+from bb.fetch2 import FetchError
+from bb.fetch2 import MissingParameterError
+from bb.fetch2 import runfetchcmd
class Osc(Fetch):
"""Class to fetch a module or modules from Opensuse build server
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py
index 222ed7eaa..18b27812e 100644
--- a/bitbake/lib/bb/fetch2/perforce.py
+++ b/bitbake/lib/bb/fetch2/perforce.py
@@ -30,9 +30,9 @@ import os
import logging
import bb
from bb import data
-from bb.fetch import Fetch
-from bb.fetch import FetchError
-from bb.fetch import logger
+from bb.fetch2 import Fetch
+from bb.fetch2 import FetchError
+from bb.fetch2 import logger
class Perforce(Fetch):
def supports(self, url, ud, d):
diff --git a/bitbake/lib/bb/fetch2/repo.py b/bitbake/lib/bb/fetch2/repo.py
index 03642e7a0..3330957ce 100644
--- a/bitbake/lib/bb/fetch2/repo.py
+++ b/bitbake/lib/bb/fetch2/repo.py
@@ -26,8 +26,8 @@ BitBake "Fetch" repo (git) implementation
import os
import bb
from bb import data
-from bb.fetch import Fetch
-from bb.fetch import runfetchcmd
+from bb.fetch2 import Fetch
+from bb.fetch2 import runfetchcmd
class Repo(Fetch):
"""Class to fetch a module or modules from repo (git) repositories"""
diff --git a/bitbake/lib/bb/fetch2/ssh.py b/bitbake/lib/bb/fetch2/ssh.py
index 86c76f4e4..8b283222b 100644
--- a/bitbake/lib/bb/fetch2/ssh.py
+++ b/bitbake/lib/bb/fetch2/ssh.py
@@ -38,8 +38,8 @@ IETF secsh internet draft:
import re, os
from bb import data
-from bb.fetch import Fetch
-from bb.fetch import FetchError
+from bb.fetch2 import Fetch
+from bb.fetch2 import FetchError
__pattern__ = re.compile(r'''
diff --git a/bitbake/lib/bb/fetch2/svk.py b/bitbake/lib/bb/fetch2/svk.py
index 595a9da25..7990ff21f 100644
--- a/bitbake/lib/bb/fetch2/svk.py
+++ b/bitbake/lib/bb/fetch2/svk.py
@@ -29,10 +29,10 @@ import os
import logging
import bb
from bb import data
-from bb.fetch import Fetch
-from bb.fetch import FetchError
-from bb.fetch import MissingParameterError
-from bb.fetch import logger
+from bb.fetch2 import Fetch
+from bb.fetch2 import FetchError
+from bb.fetch2 import MissingParameterError
+from bb.fetch2 import logger
class Svk(Fetch):
"""Class to fetch a module or modules from svk repositories"""
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index 8f053abf7..3315b159d 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -28,11 +28,11 @@ import sys
import logging
import bb
from bb import data
-from bb.fetch import Fetch
-from bb.fetch import FetchError
-from bb.fetch import MissingParameterError
-from bb.fetch import runfetchcmd
-from bb.fetch import logger
+from bb.fetch2 import Fetch
+from bb.fetch2 import FetchError
+from bb.fetch2 import MissingParameterError
+from bb.fetch2 import runfetchcmd
+from bb.fetch2 import logger
class Svn(Fetch):
"""Class to fetch a module or modules from svn repositories"""
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 4d4bdfd49..cf36ccad0 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -30,7 +30,7 @@ import logging
import bb
import urllib
from bb import data
-from bb.fetch import Fetch, FetchError, encodeurl, decodeurl, logger, runfetchcmd
+from bb.fetch2 import Fetch, FetchError, encodeurl, decodeurl, logger, runfetchcmd
class Wget(Fetch):
"""Class to fetch urls via 'wget'"""
--
cgit v1.2.3