mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -6,12 +6,12 @@ python migrate_localcount_handler () {
|
||||
if not e.data:
|
||||
return
|
||||
|
||||
pv = e.data.getVar('PV', True)
|
||||
pv = e.data.getVar('PV')
|
||||
if not 'AUTOINC' in pv:
|
||||
return
|
||||
|
||||
localcounts = bb.persist_data.persist('BB_URI_LOCALCOUNT', e.data)
|
||||
pn = e.data.getVar('PN', True)
|
||||
pn = e.data.getVar('PN')
|
||||
revs = localcounts.get_by_pattern('%%-%s_rev' % pn)
|
||||
counts = localcounts.get_by_pattern('%%-%s_count' % pn)
|
||||
if not revs or not counts:
|
||||
@@ -21,10 +21,10 @@ python migrate_localcount_handler () {
|
||||
bb.warn("The number of revs and localcounts don't match in %s" % pn)
|
||||
return
|
||||
|
||||
version = e.data.getVar('PRAUTOINX', True)
|
||||
version = e.data.getVar('PRAUTOINX')
|
||||
srcrev = bb.fetch2.get_srcrev(e.data)
|
||||
base_ver = 'AUTOINC-%s' % version[:version.find(srcrev)]
|
||||
pkgarch = e.data.getVar('PACKAGE_ARCH', True)
|
||||
pkgarch = e.data.getVar('PACKAGE_ARCH')
|
||||
value = max(int(count) for count in counts)
|
||||
|
||||
if len(revs) == 1:
|
||||
@@ -33,8 +33,8 @@ python migrate_localcount_handler () {
|
||||
else:
|
||||
value += 1
|
||||
|
||||
bb.utils.mkdirhier(e.data.getVar('PRSERV_DUMPDIR', True))
|
||||
df = e.data.getVar('LOCALCOUNT_DUMPFILE', True)
|
||||
bb.utils.mkdirhier(e.data.getVar('PRSERV_DUMPDIR'))
|
||||
df = e.data.getVar('LOCALCOUNT_DUMPFILE')
|
||||
flock = bb.utils.lockfile("%s.lock" % df)
|
||||
with open(df, 'a') as fd:
|
||||
fd.write('PRAUTO$%s$%s$%s = "%s"\n' %
|
||||
|
||||
Reference in New Issue
Block a user