summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/fetch/__init__.py4
-rw-r--r--bitbake/lib/bb/runqueue.py2
-rw-r--r--bitbake/lib/bb/taskdata.py2
-rw-r--r--bitbake/lib/bb/utils.py7
4 files changed, 7 insertions, 8 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index 5616c79ab..e6cc1c535 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -128,7 +128,7 @@ def encodeurl(decoded):
(type, host, path, user, pswd, p) = decoded
if not type or not path:
- fatal("invalid or missing parameters for url encoding")
+ bb.msg.fatal(bb.msg.domain.Fetcher, "invalid or missing parameters for url encoding")
url = '%s://' % type
if user:
url += "%s" % user
@@ -477,7 +477,7 @@ def try_mirrors(d, uri, mirrors, check = False):
try:
ud = FetchData(newuri, ld)
except bb.fetch.NoMethodError:
- bb.msg.debug(1, bb.msg.domain.Fetcher, "No method for %s" % url)
+ bb.msg.debug(1, bb.msg.domain.Fetcher, "No method for %s" % uri)
continue
ud.setup_localpath(ld)
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 887cb5c2b..c5f4380c8 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -924,7 +924,7 @@ class RunQueue:
if self.stats.total == 0:
# nothing to do
- self.state = runQueueCleanup
+ self.state = runQueueCleanUp
while True:
task = None
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py
index 841d243e5..3e5e006f5 100644
--- a/bitbake/lib/bb/taskdata.py
+++ b/bitbake/lib/bb/taskdata.py
@@ -174,7 +174,7 @@ class TaskData:
for dep in task_deps['depends'][task].split():
if dep:
if ":" not in dep:
- bb.msg.fatal(bb.msg.domain.TaskData, "Error, dependency %s does not contain ':' character\n. Task 'depends' should be specified in the form 'packagename:task'" % (depend, fn))
+ bb.msg.fatal(bb.msg.domain.TaskData, "Error, dependency %s does not contain ':' character\n. Task 'depends' should be specified in the form 'packagename:task'" % (dep, fn))
ids.append(((self.getbuild_id(dep.split(":")[0])), dep.split(":")[1]))
self.tasks_idepends[taskid].extend(ids)
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 5b7e7a360..ad0aa68b2 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -21,7 +21,8 @@ BitBake Utility Functions
separators = ".-"
-import re, fcntl, os, types, bb, string
+import re, fcntl, os, types, bb, string, stat, shutil
+from commands import getstatusoutput
def explode_version(s):
r = []
@@ -516,7 +517,7 @@ def movefile(src,dest,newmtime=None,sstat=None):
return None # failure
try:
if didcopy:
- missingos.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
+ os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown
os.unlink(src)
except Exception, e:
@@ -536,8 +537,6 @@ def copyfile(src,dest,newmtime=None,sstat=None):
attributes; mtime will be preserved even when moving across
filesystems. Returns true on success and false on failure.
"""
- import os, stat, shutil
-
#print "copyfile("+src+","+dest+","+str(newmtime)+","+str(sstat)+")"
try:
if not sstat: