[OE-core] [oe-core][PATCH 1/1] archiver: fix truncation of src_rev

Joe Slater jslater at windriver.com
Thu Oct 16 20:53:03 UTC 2014


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>
---
 meta/classes/archiver.bbclass |    4 ++--
 1 files 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')
-- 
1.7.3.4




More information about the Openembedded-core mailing list