diff options
| author | Michael Vogt <mvo@debian.org> | 2008-10-28 17:40:31 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2008-10-28 17:40:31 +0100 |
| commit | d210bd7f6a72a2b24a1402f51b39c61438482827 (patch) | |
| tree | 6065fc138bc13620b6a0c6a74d360500294291da /apt-pkg/algorithms.cc | |
| parent | 2569ac285813e0ca36d76c03cce92cf490c63e6d (diff) | |
| parent | 45e8888be58513fb8d2550413fdb37f9624ca6cc (diff) | |
* apt-pkg/acquire-item.cc:
- Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz'
available. (Closes: #409284)
* apt-pkg/algorithm.cc:
- Strip username and password from source URL in error message.
(Closes: #425150)
Diffstat (limited to 'apt-pkg/algorithms.cc')
| -rw-r--r-- | apt-pkg/algorithms.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 2e2a976bb..bd33d5ef1 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1342,7 +1342,11 @@ bool ListUpdate(pkgAcquireStatus &Stat, (*I)->Finished(); - _error->Warning(_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(), + ::URI uri((*I)->DescURI()); + uri.User.clear(); + uri.Password.clear(); + string descUri = string(uri); + _error->Warning(_("Failed to fetch %s %s\n"), descUri.c_str(), (*I)->ErrorText.c_str()); if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError) |