revert rev 1327.1.89.1.87.2.28 (bzr merge . -r 1327.1.89.1.87.2.28..1327.1.89.1...

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 6840ae120c4c9edd0a66043a0791aad1a05f6b16..cbd67055d952a37de89027a85804764869f9a5b8 100644 (file)
--- 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)
          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;
    }
       else
         MaxPipeDepth = 1;
    }

diff --git a/debian/changelog b/debian/changelog
index 01b9dbae0de1eb12566f02199adfa8d19c49c25f..f811a4c0ca010ec3e2917f2e372b8b1e1ae4c9e9 100644 (file)
--- 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/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)
   * 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
     - 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 ]
   * make apt build with g++ 4.3
 
   [ Ian Jackson ]