diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-08 15:26:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-08 15:27:37 +0000 |
commit | 6ee5d95317de77c1cfb6db6f1ab2de77f5fa085e (patch) | |
tree | 3cbdf2bd0186aaa777adc40de2c33efcabb90fe0 /bitbake/lib/bb | |
parent | 854daab404a23e4ebb6107d737d9cfd5a0e5548b (diff) | |
download | poky-6ee5d95317de77c1cfb6db6f1ab2de77f5fa085e.tar.gz |
bitbake: fetch2/gitannex: Fix function arguments to match bitbake master
This code clearly uses an earlier fetcher API. Update it to match master.
(Bitbake rev: e13acb4113ce75226664c3006a9776cc885e860d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/fetch2/gitannex.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/gitannex.py b/bitbake/lib/bb/fetch2/gitannex.py index 02711b0be6..0f37897450 100644 --- a/bitbake/lib/bb/fetch2/gitannex.py +++ b/bitbake/lib/bb/fetch2/gitannex.py | |||
@@ -28,7 +28,7 @@ from bb.fetch2 import runfetchcmd | |||
28 | from bb.fetch2 import logger | 28 | from bb.fetch2 import logger |
29 | 29 | ||
30 | class GitANNEX(Git): | 30 | class GitANNEX(Git): |
31 | def supports(self, url, ud, d): | 31 | def supports(self, ud, d): |
32 | """ | 32 | """ |
33 | Check to see if a given url can be fetched with git. | 33 | Check to see if a given url can be fetched with git. |
34 | """ | 34 | """ |
@@ -44,7 +44,7 @@ class GitANNEX(Git): | |||
44 | 44 | ||
45 | return False | 45 | return False |
46 | 46 | ||
47 | def update_annex(self, u, ud, d): | 47 | def update_annex(self, ud, d): |
48 | try: | 48 | try: |
49 | runfetchcmd("%s annex get --all" % (ud.basecmd), d, quiet=True) | 49 | runfetchcmd("%s annex get --all" % (ud.basecmd), d, quiet=True) |
50 | except bb.fetch.FetchError: | 50 | except bb.fetch.FetchError: |
@@ -53,13 +53,13 @@ class GitANNEX(Git): | |||
53 | 53 | ||
54 | return True | 54 | return True |
55 | 55 | ||
56 | def download(self, loc, ud, d): | 56 | def download(self, ud, d): |
57 | Git.download(self, loc, ud, d) | 57 | Git.download(self, ud, d) |
58 | 58 | ||
59 | os.chdir(ud.clonedir) | 59 | os.chdir(ud.clonedir) |
60 | annex = self.uses_annex(ud, d) | 60 | annex = self.uses_annex(ud, d) |
61 | if annex: | 61 | if annex: |
62 | self.update_annex(loc, ud, d) | 62 | self.update_annex(ud, d) |
63 | 63 | ||
64 | def unpack(self, ud, destdir, d): | 64 | def unpack(self, ud, destdir, d): |
65 | Git.unpack(self, ud, destdir, d) | 65 | Git.unpack(self, ud, destdir, d) |