summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-01-31 04:15:48 +0000
committerZac Medico <zmedico@gentoo.org>2008-01-31 04:15:48 +0000
commit33bb697009be4ac3631d46ebabe27e47a6265523 (patch)
treedfeaf7540e65cb9cf8fb2c5b874f892d99d7aff4
parent0d0b7665adac627ca1c6e7e885f0b91cbb465b67 (diff)
downloadportage-33bb697009be4ac3631d46ebabe27e47a6265523.tar.gz
portage-33bb697009be4ac3631d46ebabe27e47a6265523.tar.bz2
portage-33bb697009be4ac3631d46ebabe27e47a6265523.zip
* Bug #205966 - Don't show binhost password when displaying the uri.
* Fix a cpv variable name typo. svn path=/main/trunk/; revision=9238
-rw-r--r--pym/portage/dbapi/bintree.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 48e38beb4..ba0809f48 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -15,6 +15,7 @@ from portage import dep_expand, listdir, _movefile
import portage.xpak, portage.getbinpkg
import os, errno, stat
+import re
from itertools import izip
class bindbapi(fakedbapi):
@@ -531,7 +532,7 @@ class binarytree(object):
except portage.exception.InvalidDependString:
writemsg("!!! Invalid binary package: '%s'\n" % \
self.getname(mycpv), noiselevel=-1)
- self.dbapi.cpv_remove(cpv)
+ self.dbapi.cpv_remove(mycpv)
del pkg_paths[mycpv]
# record location if it's non-default
@@ -640,7 +641,9 @@ class binarytree(object):
except (ValueError, KeyError):
chunk_size = 3000
writemsg_stdout("\n")
- writemsg_stdout(green("Fetching bininfo from ")+base_url+"\n")
+ writemsg_stdout(
+ green("Fetching bininfo from ") + \
+ re.sub(r'//(.+):.+@(.+)/', r'//\1:*password*@\2/', base_url) + "\n")
self.remotepkgs = portage.getbinpkg.dir_get_metadata(
self.settings["PORTAGE_BINHOST"], chunk_size=chunk_size)
#writemsg(green(" -- DONE!\n\n"))