summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2007-10-21 23:11:16 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2007-10-21 23:11:16 +0000
commit9cd5091c3641a1eec2b26f26b8b678ee38c20efb (patch)
treefa3f6e18a485d454066d77f1a2189d283664a202
parent89a79fd201bb8cf3e0aae4aca4e94b2bb3488ffc (diff)
downloadbitbake-9cd5091c3641a1eec2b26f26b8b678ee38c20efb.tar.gz
providers.py: Fix bogus preferred_version return values
-rw-r--r--ChangeLog1
-rw-r--r--lib/bb/providers.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bddc3511e..180f84c11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Changes in BitBake 1.8.x:
do_taskname[cleandirs] = "dir"
- bzr fetcher tweaks from Robert Schuster (#2913)
- Add mercurial (hg) fetcher from Robert Schuster (#2913)
+ - Fix bogus preferred_version return values
Changes in Bitbake 1.8.8:
- Rewrite svn fetcher to make adding extra operations easier
diff --git a/lib/bb/providers.py b/lib/bb/providers.py
index da762d3d5..2f6b620b3 100644
--- a/lib/bb/providers.py
+++ b/lib/bb/providers.py
@@ -70,6 +70,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
"""
preferred_file = None
+ preferred_ver = None
localdata = data.createCopy(cfgData)
bb.data.setVar('OVERRIDES', "pn-%s:%s:%s" % (pn, pn, data.getVar('OVERRIDES', localdata)), localdata)
@@ -115,7 +116,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
else:
bb.msg.debug(1, bb.msg.domain.Provider, "selecting %s as PREFERRED_VERSION %s of package %s%s" % (preferred_file, pv_str, pn, itemstr))
- return (preferred_v, preferred_file)
+ return (preferred_ver, preferred_file)
def findLatestProvider(pn, cfgData, dataCache, file_set):