From ac90f129cfed9f9761f4f95a8e4d227a7831d270 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Fri, 20 May 2005 20:39:43 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/20 21:49:48+02:00 handhelds.org!zecke opie-lockapplet/opie-security: lock.png is installed by both opie-lockapplet and opie-security. As opie-lockapplet depends on opie-security we will leave it to opie-security to install lock.png 2005/05/20 21:41:54+02:00 handhelds.org!zecke classes/base.bbclass: Call the fetcher methods with a data-instance instead of None BKrev: 428e4b0fK4bxvnkYhyIyuoE_4wi3Gw --- classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 1ce9918cb8..0d29de144a 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -324,7 +324,7 @@ python base_do_fetch() { return 1 try: - bb.fetch.init(src_uri.split()) + bb.fetch.init(src_uri.split(),d) except bb.fetch.NoMethodError: (type, value, traceback) = sys.exc_info() raise bb.build.FuncFailed("No method: %s" % value) @@ -438,7 +438,7 @@ python base_do_patch() { if not "patch" in parm: continue - bb.fetch.init([url]) + bb.fetch.init([url], d) url = bb.encodeurl((type, host, path, user, pswd, [])) local = os.path.join('/', bb.fetch.localpath(url, d)) -- cgit v1.2.3