archiver: fix truncation of src_rev

In trying to eliminate AUTOINC+ from revision strings,
we accidently truncated the strings to almost guarantee
information from SRCREV_FORMAT, when supplied, would be
lost.  So, we now only delete any AUTOINC+'s from the string.

(From OE-Core rev: 83c6930cdfac5a7759c4786172a5c70226e6adc4)

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joe Slater
2014-10-16 13:53:03 -07:00
committed by Richard Purdie
parent caebcda412
commit 1a0485040c

View File

@@ -146,9 +146,9 @@ python do_ar_original() {
fetch.unpack(tmpdir, (url,))
os.chdir(tmpdir)
# We split on '+' to chuck any annoying AUTOINC+ in the revision.
# We eliminate any AUTOINC+ in the revision.
try:
src_rev = bb.fetch2.get_srcrev(d).split('+')[-1][:10]
src_rev = bb.fetch2.get_srcrev(d).replace('AUTOINC+','')
except:
src_rev = 'NOREV'
tarname = os.path.join(ar_outdir, basename + '.' + src_rev + '.tar.gz')