From ebd3ecdb5f3c6d3fe1fad27cbed4d80f4277e92e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 2 Jul 2012 21:23:04 +0100 Subject: fetch2/svn: Enhance to cope with subversion 1.7 upgrade svn changed working checkout formats between 1.6 and 1.7. Its convoluted to detect what format a given working copy is in so the simplest solution is simply to run "svn upgrade" within the working copy. The base svn command variable is relocated slightly to enable this new code to work effectively. Signed-off-by: Richard Purdie --- lib/bb/fetch2/svn.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index 59d7ccbac..bc5b96b55 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -49,6 +49,8 @@ class Svn(FetchMethod): if not "module" in ud.parm: raise MissingParameterError('module', ud.url) + ud.basecmd = d.getVar('FETCHCMD_svn', True) + ud.module = ud.parm["module"] # Create paths to svn checkouts @@ -69,8 +71,6 @@ class Svn(FetchMethod): command is "fetch", "update", "info" """ - basecmd = data.expand('${FETCHCMD_svn}', d) - proto = ud.parm.get('proto', 'svn') svn_rsh = None @@ -88,7 +88,7 @@ class Svn(FetchMethod): options.append("--password %s" % ud.pswd) if command == "info": - svncmd = "%s info %s %s://%s/%s/" % (basecmd, " ".join(options), proto, svnroot, ud.module) + svncmd = "%s info %s %s://%s/%s/" % (ud.basecmd, " ".join(options), proto, svnroot, ud.module) else: suffix = "" if ud.revision: @@ -96,9 +96,9 @@ class Svn(FetchMethod): suffix = "@%s" % (ud.revision) if command == "fetch": - svncmd = "%s co %s %s://%s/%s%s %s" % (basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module) + svncmd = "%s co %s %s://%s/%s%s %s" % (ud.basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module) elif command == "update": - svncmd = "%s update %s" % (basecmd, " ".join(options)) + svncmd = "%s update %s" % (ud.basecmd, " ".join(options)) else: raise FetchError("Invalid svn command %s" % command, ud.url) @@ -117,6 +117,11 @@ class Svn(FetchMethod): logger.info("Update " + loc) # update sources there os.chdir(ud.moddir) + # We need to attempt to run svn upgrade first in case its an older working format + try: + runfetchcmd(ud.basecmd + " upgrade", d) + except FetchError: + pass logger.debug(1, "Running %s", svnupdatecmd) bb.fetch2.check_network_access(d, svnupdatecmd, ud.url) runfetchcmd(svnupdatecmd, d) -- cgit 1.2.3-korg