From e850c53d4d8cb877a704a23f9ce02d6185ba3ffa Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 22 Nov 2013 15:07:34 +0000 Subject: metadata_scm: Avoid crashing on new svn version layouts This avoids crashing on newer svn layouts where the entries files don't contain three lines. If someone wants to fix this to get the right version on newer subversion checkouts, patches welcome but this at least stops things crashing. [YOCTO #5363] Signed-off-by: Richard Purdie --- meta/classes/metadata_scm.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass index 8d3988ace8..ba0edf9486 100644 --- a/meta/classes/metadata_scm.bbclass +++ b/meta/classes/metadata_scm.bbclass @@ -54,11 +54,13 @@ def base_get_metadata_monotone_revision(path, d): return monotone_revision def base_get_metadata_svn_revision(path, d): + # This only works with older subversion. For newer versions + # this function will need to be fixed by someone interested revision = "" try: with open("%s/.svn/entries" % path) as f: revision = f.readlines()[3].strip() - except IOError: + except IOError, IndexError: pass return revision -- cgit 1.2.3-korg