From 53f096c5d72dd15336fdf921f29ceae9b5842148 Mon Sep 17 00:00:00 2001 From: David James Date: Fri, 11 Feb 2011 09:25:26 -0800 Subject: Add support for grabbing Packages files using external programs. If the user specifies FETCHCOMMAND_*, Portage should honor this when grabbing Packages files. This allows users to setup support for grabbing Packages files from other protocols. BUG=chrome-os-partner:2026 TEST=Try downloading prebuilts from gs:// when FETCHCOMMAND_GS is setup in make.conf Change-Id: I96b239819351633dd02d608954e81a1c363a4687 Review URL: http://codereview.chromium.org/6458015 --- pym/portage/getbinpkg.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pym/portage/getbinpkg.py') diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index f85b65c00..43a6bf5f7 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -431,17 +431,19 @@ def file_get_metadata(baseurl,conn=None, chunk_size=3000): return myid -def file_get(baseurl,dest,conn=None,fcmd=None): +def file_get(baseurl,dest,conn=None,fcmd=None,filename=None): """(baseurl,dest,fcmd=) -- Takes a base url to connect to and read from. URI should be in the form ://[user[:pass]@][:port]""" if not fcmd: return file_get_lib(baseurl,dest,conn) + if not filename: + filename = os.path.basename(baseurl) variables = { "DISTDIR": dest, "URI": baseurl, - "FILE": os.path.basename(baseurl) + "FILE": filename } from portage.util import varexpand -- cgit v1.2.3-1-g7c22