diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-01-06 17:35:11 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-01-06 17:35:11 +0000 |
commit | fd1be2840a314a493e9064e77752c278b9c6e143 (patch) | |
tree | 95977aa50c9bbdf0286426552d3368fd3e19083b | |
parent | 5de7b22df390d78f49c816a737e33926f108e1cb (diff) | |
download | bitbake-fd1be2840a314a493e9064e77752c278b9c6e143.tar.gz |
fetchers: Properly raise errors for invalid source URI protocols (from poky). utils.py: Fix a spelling mistake.
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | lib/bb/fetch/__init__.py | 3 | ||||
-rw-r--r-- | lib/bb/utils.py | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -35,6 +35,7 @@ Changes in BitBake 1.8.x: - Add support for "-e target" (#3432) - Fix shell showdata command (#3259) - Fix shell data updating problems (#1880) + - Properly raise errors for invalid source URI protocols Changes in Bitbake 1.8.8: - Rewrite svn fetcher to make adding extra operations easier diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py index d75c618de..700efcb4a 100644 --- a/lib/bb/fetch/__init__.py +++ b/lib/bb/fetch/__init__.py @@ -281,7 +281,8 @@ class FetchData(object): for m in methods: if m.supports(url, self, d): self.method = m - break + return + raise NoMethodError("Missing implementation for url %s" % url) def setup_localpath(self, d): self.setup = True diff --git a/lib/bb/utils.py b/lib/bb/utils.py index c27dafd61..a2a5ff6cf 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -205,13 +205,13 @@ def Enum(*names): def lockfile(name): """ - Use the file fn as a lock file, return when the lock has been aquired. + Use the file fn as a lock file, return when the lock has been acquired. Returns a variable to pass to unlockfile(). """ while True: # If we leave the lockfiles lying around there is no problem # but we should clean up after ourselves. This gives potential - # for races though. To work around this, when we aquire the lock + # for races though. To work around this, when we acquire the lock # we check the file we locked was still the lock file on disk. # by comparing inode numbers. If they don't match or the lockfile # no longer exists, we start again. |