mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: Sync bzr fetcher with upstream

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2866 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-10-11 21:42:24 +00:00
parent 388c2f80ff
commit 46b69ea92e
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake/lib/bb/fetch/bzr.py
View File

@@ -87,7 +87,7 @@ class Bzr(Fetch):
if command is "fetch": if command is "fetch":
bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
elif command is "update": elif command is "update":
bzrcmd = "%s update %s" % (basecmd, " ".join(options)) bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options))
else: else:
raise FetchError("Invalid bzr command %s" % command) raise FetchError("Invalid bzr command %s" % command)
@@ -101,8 +101,7 @@ class Bzr(Fetch):
bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping bzr checkout." % ud.localpath) bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping bzr checkout." % ud.localpath)
return return
# Updating is disabled until bzr supports the syntax "bzr update -r X" to specify a revision if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
if 0 and os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
bzrcmd = self._buildbzrcommand(ud, d, "update") bzrcmd = self._buildbzrcommand(ud, d, "update")
bb.msg.debug(1, bb.msg.domain.Fetcher, "BZR Update %s" % loc) bb.msg.debug(1, bb.msg.domain.Fetcher, "BZR Update %s" % loc)
os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path))) os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path)))
@@ -145,10 +144,7 @@ class Bzr(Fetch):
output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True) output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True)
for line in output.splitlines(): return output.strip()
revision = line
return revision
def _sortable_revision(self, url, ud, d): def _sortable_revision(self, url, ud, d):
""" """