summaryrefslogtreecommitdiffstats
path: root/pym/portage/getbinpkg.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-05-13 22:29:40 -0700
committerZac Medico <zmedico@gentoo.org>2012-05-13 22:29:40 -0700
commitab387fc38d867934c5d360fa0eb311c5bdbeb95c (patch)
treef48794d2c0bb6f22c71a82e1b1a3ba1f6dd58d09 /pym/portage/getbinpkg.py
parent2c191d17c5c879c51aeb1c6043d9185b9a5887c0 (diff)
downloadportage-ab387fc38d867934c5d360fa0eb311c5bdbeb95c.tar.gz
portage-ab387fc38d867934c5d360fa0eb311c5bdbeb95c.tar.bz2
portage-ab387fc38d867934c5d360fa0eb311c5bdbeb95c.zip
Split out _hide_url_passwd() and use it more.
Diffstat (limited to 'pym/portage/getbinpkg.py')
-rw-r--r--pym/portage/getbinpkg.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index 7dec20a44..212f78889 100644
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -1,5 +1,5 @@
# getbinpkg.py -- Portage binary-package helper functions
-# Copyright 2003-2011 Gentoo Foundation
+# Copyright 2003-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from portage.output import colorize
@@ -10,6 +10,7 @@ from portage import os
from portage import _encodings
from portage import _unicode_decode
from portage import _unicode_encode
+from portage.package.ebuild.fetch import _hide_url_passwd
from _emerge.Package import _all_metadata_keys
import sys
@@ -578,7 +579,8 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache=
try:
filelist = dir_get_list(baseurl, conn)
except portage.exception.PortageException as e:
- sys.stderr.write(_("!!! Error connecting to '%s'.\n") % baseurl)
+ sys.stderr.write(_("!!! Error connecting to '%s'.\n") %
+ _hide_url_passwd(baseurl))
sys.stderr.write("!!! %s\n" % str(e))
del e
return metadata[baseurl]["data"]