diff options
| author | Michael Vogt <egon@tas> | 2008-10-28 16:48:16 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@tas> | 2008-10-28 16:48:16 +0100 |
| commit | 70b3d263556241a0cb8217006f4dbef1138de25d (patch) | |
| tree | a09c56df0b59a984a10392a090adbac29e734806 /apt-pkg/algorithms.cc | |
| parent | a15489ce5d8946c6cf76e24afb5f9288814e49fc (diff) | |
| parent | 4b94b383390fb93c58fb14460679fadbb3c8ee93 (diff) | |
| download | apt-70b3d263556241a0cb8217006f4dbef1138de25d.tar.gz | |
* 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) |