package_rpm: Ensure PV manipulations are correct

The previous change to this function fixed one manipuation at
the expense of the other, depending on ow expanded the versioned
dependency string was when the AUTOINC substitution was made.

This update ensures we cover both cases and ensures the classextended
version works as as well as the normal case.

(From OE-Core rev: 0f8447a7d99d2645b932eac1c24149f0c2d3791e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-03-16 15:46:15 +00:00
parent 1ceb13dda1
commit b5e5d25c25

View File

@@ -610,7 +610,7 @@ python write_specfile () {
pv = subd['PV']
pkgv = subd['PKGV']
reppv = pkgv.replace('-', '+')
verlist.append(ver.replace(pv, reppv))
verlist.append(ver.replace(pv, reppv).replace(pkgv, reppv))
else:
verlist.append(ver)
newdeps_dict[dep] = verlist