diff options
author | Richard Purdie <richard@openedhand.com> | 2007-05-22 11:50:37 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-05-22 11:50:37 +0000 |
commit | d05bcee7f21250854c56fd47b1d5c064ac95efb2 (patch) | |
tree | 6941498b4a0bf46d89fe441e91f2c57e59dbc915 /bitbake/lib/bb/cooker.py | |
parent | 6e49fdb6db438a947c0122a350cd223dc1ab12db (diff) | |
download | openembedded-core-d05bcee7f21250854c56fd47b1d5c064ac95efb2.tar.gz openembedded-core-d05bcee7f21250854c56fd47b1d5c064ac95efb2.tar.bz2 openembedded-core-d05bcee7f21250854c56fd47b1d5c064ac95efb2.zip |
bitbake: Merge bugfixes from bitbake-1.8 svn
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1759 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 4b2a906133..1868b268a3 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -26,7 +26,7 @@ import sys, os, getopt, glob, copy, os.path, re, time import bb from bb import utils, data, parse, event, cache, providers, taskdata, runqueue from sets import Set -import itertools +import itertools, sre_constants parsespin = itertools.cycle( r'|/-\\' ) @@ -201,7 +201,7 @@ class BBCooker: fnid = rq.runq_fnid[task] fn = taskdata.fn_index[fnid] pn = self.status.pkg_fn[fn] - version = self.bb_cache.getVar('PV', fn, True ) + '-' + self.bb_cache.getVar('PR', fn, True) + version = "%s:%s-%s" % self.status.pkg_pepvpr[fn] print >> tdepends_file, '"%s.%s" [label="%s %s\\n%s\\n%s"]' % (pn, taskname, pn, taskname, version, fn) for dep in rq.runq_depends[task]: depfn = taskdata.fn_index[rq.runq_fnid[dep]] |