[oe-commits] Joe Slater : archiver: fix truncation of src_rev

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 83c6930cdfac5a7759c4786172a5c70226e6adc4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=83c6930cdfac5a7759c4786172a5c70226e6adc4

Author: Joe Slater <jslater at windriver.com>
Date:   Thu Oct 16 13:53:03 2014 -0700

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

---

 meta/classes/archiver.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 058ba63..b598aa3 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')