diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-22 15:07:34 +0000 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-12-03 16:49:24 +0000 |
| commit | 9fdea109d65c338913caa22e3a09f0408c361536 (patch) | |
| tree | 59ccd3c65852dcbaa68d76ddc45663cbed9fd4cf | |
| parent | 43003ea2094e0cdc779030b3c35fa79e6d967895 (diff) | |
| download | openembedded-core-9fdea109d65c338913caa22e3a09f0408c361536.tar.gz | |
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]
(From OE-Core master rev: e850c53d4d8cb877a704a23f9ce02d6185ba3ffa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/metadata_scm.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass index 502d400cbb..cc8abe6292 100644 --- a/meta/classes/metadata_scm.bbclass +++ b/meta/classes/metadata_scm.bbclass @@ -52,10 +52,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 = "<unknown>" try: - revision = file( "%s/.svn/entries" % path ).readlines()[3].strip() - except IOError: + with open("%s/.svn/entries" % path) as f: + revision = f.readlines()[3].strip() + except IOError, IndexError: pass return revision |