From patchwork Sat May 14 03:23:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Bitbake-dev, 1/1] Change bzr fetcher to use appropriate branch/pull mechanism. This fixes the error: bzr: ERROR: No pull location known or specified. Date: Sat, 14 May 2011 03:23:36 -0000 From: Darren Hollenbeck X-Patchwork-Id: 4021 Message-Id: <1305343416-1122-1-git-send-email-darren@softplc.com> To: bitbake-dev@lists.berlios.de received if a different revision of the same source is attempted to be fetched. Using branch sets the pull location and is also the more appropriate form of 'checkout' to use with bitbake activity. --- lib/bb/fetch/bzr.py | 2 +- lib/bb/fetch2/bzr.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bb/fetch/bzr.py b/lib/bb/fetch/bzr.py index 85a9294..68f3bb3 100644 --- a/lib/bb/fetch/bzr.py +++ b/lib/bb/fetch/bzr.py @@ -74,7 +74,7 @@ class Bzr(Fetch): options.append("-r %s" % ud.revision) if command == "fetch": - bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) + bzrcmd = "%s branch %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) elif command == "update": bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options)) else: diff --git a/lib/bb/fetch2/bzr.py b/lib/bb/fetch2/bzr.py index 04a9087..0d4d25c 100644 --- a/lib/bb/fetch2/bzr.py +++ b/lib/bb/fetch2/bzr.py @@ -71,7 +71,7 @@ class Bzr(FetchMethod): options.append("-r %s" % ud.revision) if command == "fetch": - bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) + bzrcmd = "%s branch %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) elif command == "update": bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options)) else: