fetchers: Properly raise errors for invalid source URI protocols (from poky). utils.py: Fix a spelling mistake.

3 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 95ef1a8a5..0ffd515dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,7 @@ Changes in Bitbake 1.9.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.0:
 	- Release 1.7.x as a stable series
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.