updated portage to 2.2.8-r1HEADmaster

1 files changed, 76 insertions, 13 deletions

diff --git a/portage_with_autodep/pym/portage/getbinpkg.py b/portage_with_autodep/pym/portage/getbinpkg.py
index 212f788..ff656ba 100644
--- a/portage_with_autodep/pym/portage/getbinpkg.py
+++ b/portage_with_autodep/pym/portage/getbinpkg.py
@@ -1,7 +1,9 @@
 # getbinpkg.py -- Portage binary-package helper functions
-# Copyright 2003-2012 Gentoo Foundation
+# Copyright 2003-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+from __future__ import unicode_literals
+
 from portage.output import colorize
 from portage.cache.mappings import slot_dict_class
 from portage.localization import _
@@ -18,6 +20,7 @@ import socket
 import time
 import tempfile
 import base64
+import warnings
 
 _all_errors = [NotImplementedError, ValueError, socket.error]
 
@@ -65,6 +68,10 @@ if sys.hexversion >= 0x3000000:
 	long = int
 
 def make_metadata_dict(data):
+
+	warnings.warn("portage.getbinpkg.make_metadata_dict() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	myid,myglob = data
 	
 	mydict = {}
@@ -84,6 +91,10 @@ class ParseLinks(html_parser_HTMLParser):
 	"""Parser class that overrides HTMLParser to grab all anchors from an html
 	page and provide suffix and prefix limitors"""
 	def __init__(self):
+
+		warnings.warn("portage.getbinpkg.ParseLinks is deprecated",
+			DeprecationWarning, stacklevel=2)
+
 		self.PL_anchors = []
 		html_parser_HTMLParser.__init__(self)
 
@@ -122,6 +133,9 @@ def create_conn(baseurl,conn=None):
 	optional connection. If connection is already active, it is passed on.
 	baseurl is reduced to address and is returned in tuple (conn,address)"""
 
+	warnings.warn("portage.getbinpkg.create_conn() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	parts = baseurl.split("://",1)
 	if len(parts) != 2:
 		raise ValueError(_("Provided URI does not "
@@ -221,6 +235,10 @@ def create_conn(baseurl,conn=None):
 def make_ftp_request(conn, address, rest=None, dest=None):
 	"""(conn,address,rest) --- uses the conn object to request the data
 	from address and issuing a rest if it is passed."""
+
+	warnings.warn("portage.getbinpkg.make_ftp_request() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	try:
 	
 		if dest:
@@ -270,6 +288,9 @@ def make_http_request(conn, address, params={}, headers={}, dest=None):
 	the data from address, performing Location forwarding and using the
 	optional params and headers."""
 
+	warnings.warn("portage.getbinpkg.make_http_request() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	rc = 0
 	response = None
 	while (rc == 0) or (rc == 301) or (rc == 302):
@@ -312,6 +333,10 @@ def make_http_request(conn, address, params={}, headers={}, dest=None):
 
 
 def match_in_array(array, prefix="", suffix="", match_both=1, allow_overlap=0):
+
+	warnings.warn("portage.getbinpkg.match_in_array() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	myarray = []
 	
 	if not (prefix and suffix):
@@ -352,6 +377,9 @@ def dir_get_list(baseurl,conn=None):
 	URI should be in the form <proto>://<site>[:port]<path>
 	Connection is used for persistent connection instances."""
 
+	warnings.warn("portage.getbinpkg.dir_get_list() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	if not conn:
 		keepconnection = 0
 	else:
@@ -400,6 +428,9 @@ def file_get_metadata(baseurl,conn=None, chunk_size=3000):
 	URI should be in the form <proto>://<site>[:port]<path>
 	Connection is used for persistent connection instances."""
 
+	warnings.warn("portage.getbinpkg.file_get_metadata() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	if not conn:
 		keepconnection = 0
 	else:
@@ -446,30 +477,53 @@ def file_get_metadata(baseurl,conn=None, chunk_size=3000):
 	return myid
 
 
-def file_get(baseurl,dest,conn=None,fcmd=None,filename=None):
+def file_get(baseurl=None, dest=None, conn=None, fcmd=None, filename=None,
+	fcmd_vars=None):
 	"""(baseurl,dest,fcmd=) -- Takes a base url to connect to and read from.
 	URI should be in the form <proto>://[user[:pass]@]<site>[:port]<path>"""
 
 	if not fcmd:
+
+		warnings.warn("Use of portage.getbinpkg.file_get() without the fcmd "
+			"parameter is deprecated", DeprecationWarning, stacklevel=2)
+
 		return file_get_lib(baseurl,dest,conn)
-	if not filename:
-		filename = os.path.basename(baseurl)
 
-	variables = {
-		"DISTDIR": dest,
-		"URI":     baseurl,
-		"FILE":    filename
-	}
+	variables = {}
+
+	if fcmd_vars is not None:
+		variables.update(fcmd_vars)
+
+	if "DISTDIR" not in variables:
+		if dest is None:
+			raise portage.exception.MissingParameter(
+				_("%s is missing required '%s' key") %
+				("fcmd_vars", "DISTDIR"))
+		variables["DISTDIR"] = dest
+
+	if "URI" not in variables:
+		if baseurl is None:
+			raise portage.exception.MissingParameter(
+				_("%s is missing required '%s' key") %
+				("fcmd_vars", "URI"))
+		variables["URI"] = baseurl
+
+	if "FILE" not in variables:
+		if filename is None:
+			filename = os.path.basename(variables["URI"])
+		variables["FILE"] = filename
 
 	from portage.util import varexpand
 	from portage.process import spawn
 	myfetch = portage.util.shlex_split(fcmd)
 	myfetch = [varexpand(x, mydict=variables) for x in myfetch]
 	fd_pipes= {
-		0:sys.stdin.fileno(),
-		1:sys.stdout.fileno(),
-		2:sys.stdout.fileno()
+		0:portage._get_stdin().fileno(),
+		1:sys.__stdout__.fileno(),
+		2:sys.__stdout__.fileno()
 	}
+	sys.__stdout__.flush()
+	sys.__stderr__.flush()
 	retval = spawn(myfetch, env=os.environ.copy(), fd_pipes=fd_pipes)
 	if retval != os.EX_OK:
 		sys.stderr.write(_("Fetcher exited with a failure condition.\n"))
@@ -481,6 +535,9 @@ def file_get_lib(baseurl,dest,conn=None):
 	URI should be in the form <proto>://<site>[:port]<path>
 	Connection is used for persistent connection instances."""
 
+	warnings.warn("portage.getbinpkg.file_get_lib() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	if not conn:
 		keepconnection = 0
 	else:
@@ -524,6 +581,10 @@ def file_get_lib(baseurl,dest,conn=None):
 def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache=1, makepickle=None):
 	"""(baseurl,conn,chunk_size,verbose) -- 
 	"""
+
+	warnings.warn("portage.getbinpkg.dir_get_metadata() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	if not conn:
 		keepconnection = 0
 	else:
@@ -557,7 +618,9 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache=
 		out.write(_("Loaded metadata pickle.\n"))
 		out.flush()
 		metadatafile.close()
-	except (AttributeError, EOFError, EnvironmentError, ValueError, pickle.UnpicklingError):
+	except (SystemExit, KeyboardInterrupt):
+		raise
+	except Exception:
 		metadata = {}
 	if baseurl not in metadata:
 		metadata[baseurl]={}