summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-10-11 21:42:24 +0000
committerRichard Purdie <richard@openedhand.com>2007-10-11 21:42:24 +0000
commit46b69ea92e43d0c738e60ae04a82e9c998dda94e (patch)
tree4be437a46a39439344649eb704b61b88304a0d09
parent388c2f80ffe644ad59e302c0a5803327b2880d12 (diff)
downloadpoky-46b69ea92e43d0c738e60ae04a82e9c998dda94e.tar.gz
bitbake: Sync bzr fetcher with upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2866 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--bitbake/lib/bb/fetch/bzr.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/bitbake/lib/bb/fetch/bzr.py b/bitbake/lib/bb/fetch/bzr.py
index be89a080a0..c66d17fdd2 100644
--- a/bitbake/lib/bb/fetch/bzr.py
+++ b/bitbake/lib/bb/fetch/bzr.py
@@ -87,7 +87,7 @@ class Bzr(Fetch):
87 if command is "fetch": 87 if command is "fetch":
88 bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) 88 bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
89 elif command is "update": 89 elif command is "update":
90 bzrcmd = "%s update %s" % (basecmd, " ".join(options)) 90 bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options))
91 else: 91 else:
92 raise FetchError("Invalid bzr command %s" % command) 92 raise FetchError("Invalid bzr command %s" % command)
93 93
@@ -101,8 +101,7 @@ class Bzr(Fetch):
101 bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping bzr checkout." % ud.localpath) 101 bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping bzr checkout." % ud.localpath)
102 return 102 return
103 103
104 # Updating is disabled until bzr supports the syntax "bzr update -r X" to specify a revision 104 if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
105 if 0 and os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
106 bzrcmd = self._buildbzrcommand(ud, d, "update") 105 bzrcmd = self._buildbzrcommand(ud, d, "update")
107 bb.msg.debug(1, bb.msg.domain.Fetcher, "BZR Update %s" % loc) 106 bb.msg.debug(1, bb.msg.domain.Fetcher, "BZR Update %s" % loc)
108 os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path))) 107 os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path)))
@@ -145,10 +144,7 @@ class Bzr(Fetch):
145 144
146 output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True) 145 output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True)
147 146
148 for line in output.splitlines(): 147 return output.strip()
149 revision = line
150
151 return revision
152 148
153 def _sortable_revision(self, url, ud, d): 149 def _sortable_revision(self, url, ud, d):
154 """ 150 """