From 83c6930cdfac5a7759c4786172a5c70226e6adc4 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Thu, 16 Oct 2014 13:53:03 -0700 Subject: 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. Signed-off-by: Joe Slater Signed-off-by: Ross Burton --- meta/classes/archiver.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 058ba63437..b598aa3ad6 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -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') -- cgit 1.2.3-korg