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 <jslater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 058ba63437a3d060accce4a30540176e1d0f0c6b..b598aa3ad6504848e8c48a0ef91c56378e98cbd4 100644 (file)
--- 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')