summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-09-14 14:26:09 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-09-14 14:26:09 +0200
commit12121baed79ed5f47020b495519b68d1c37e0123 (patch)
tree0cf77933a4051d28c207f33efb76445f4a7d7580
parentdde60c5696f6779ea48febdac315083fb50e3075 (diff)
revert rev 1327.1.89.1.87.2.28 (bzr merge . -r 1327.1.89.1.87.2.28..1327.1.89.1.87.2.27)
-rw-r--r--apt-pkg/acquire.cc2
-rw-r--r--debian/changelog6
2 files changed, 1 insertions, 7 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 6840ae120..cbd67055d 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -619,7 +619,7 @@ bool pkgAcquire::Queue::Startup()
added other source retry to have cycle maintain a pipeline depth
on its own. */
if (Cnf->Pipeline == true)
- MaxPipeDepth = 1000;
+ MaxPipeDepth = 10;
else
MaxPipeDepth = 1;
}
diff --git a/debian/changelog b/debian/changelog
index 01b9dbae0..f811a4c0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,6 @@ apt (0.7.6ubuntu9) gutsy; urgency=low
* apt-pkg/deb/dpkgpm.cc:
- fix progress reporting precent calculation (LP: #137798)
- * apt-pkg/acquire.cc:
- - increase MaxPipeDepth for the internal worker<->method
- communication to 1000 for the debtorrent backend
* make apt build with g++ 4.3
* fix missing SetExecClose() call when the status-fd is used
(LP: #136767)
@@ -97,9 +94,6 @@ apt (0.7.6ubuntu1) gutsy; urgency=low
- increase default mmap size
* tests/local-repo:
- added local repository testcase
- * apt-pkg/acquire.cc:
- - increase MaxPipeDepth for the internal worker<->method
- communication to 1000 for the debtorrent backend
* make apt build with g++ 4.3
[ Ian Jackson ]