diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-11-30 07:58:36 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-11-30 07:58:36 +0000 |
| commit | a0f9b6bee8dae6eff15873db311f5a44cbb16fb3 (patch) | |
| tree | 4e57d4dfde17e9ba521386750d1bcdd0b73e6fe9 /apt-pkg/contrib/progress.cc | |
| parent | 5d47e7e8587e693050f4d6d39c7d496f12bc49b3 (diff) | |
| parent | 39442e44c7f68722014dbcd6af061c2856ce76db (diff) | |
Merge with Michael AND update PO files
* po/fr.po: Completed to 510 strings
* po/*.po��: Synced with the POT files
Patches applied:
* apt@packages.debian.org/apt--sources-list-d--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-30
* apt@packages.debian.org/apt--sources-list-d--0--patch-1
Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85
* merged with bubulle, changelog updates
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86
* merged the NMU from Franz Pop, fixed armeb problem (#333599)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87
* removed double armeb entry in buildlib/sizetable
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88
* finalized changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89
* turn off "secure-acquire" when --allow-unauthenticated is given
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90
* merged the sources.list.d patch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-91
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-93
* sources.list.d documented
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94
* pkgDirStream has (slightly) better extract support now
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95
* merge fix for #339533
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-96
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97
* some more debug output
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98
* ABI change: merged more flexible pkgAcquireFile code
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99
* merged http download limit for apt (#146877)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100
* applied parts of the string speedup patch from debian #319377 (ABI change)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101
* fix for #340448
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102
* finalized this release
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-103
* changelog updates
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-104
* build-depend on libdb4.3 now, fix for kFreeBSD (#317718)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105
* fix mailaddress
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106
* fix a string (thanks to bubulle)
Diffstat (limited to 'apt-pkg/contrib/progress.cc')
| -rw-r--r-- | apt-pkg/contrib/progress.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 8eb36fc20..cb272e389 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -50,7 +50,7 @@ void OpProgress::Progress(unsigned long Cur) // --------------------------------------------------------------------- /* */ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total, - unsigned long Size,string Op) + unsigned long Size,const string &Op) { this->Current = Current; this->Total = Total; @@ -67,7 +67,7 @@ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total, // OpProgress::SubProgress - Set the sub progress state /*{{{*/ // --------------------------------------------------------------------- /* */ -void OpProgress::SubProgress(unsigned long SubTotal,string Op) +void OpProgress::SubProgress(unsigned long SubTotal,const string &Op) { this->SubTotal = SubTotal; SubOp = Op; |