Ver código fonte

apt-pkg/packagemanager.cc:

* apt-pkg/packagemanager.cc:
  - increate APT::pkgPackageManager::MaxLoopCount to 5000
Michael Vogt 13 anos atrás
pai
commit
9c5104cf35
2 arquivos alterados com 5 adições e 2 exclusões
  1. 2 2
      apt-pkg/packagemanager.cc
  2. 3 0
      debian/changelog

+ 2 - 2
apt-pkg/packagemanager.cc

@@ -338,7 +338,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
       however if there is a loop (A depends on B, B depends on A) this will not 
       however if there is a loop (A depends on B, B depends on A) this will not 
       be the case, so check for dependencies before configuring. */
       be the case, so check for dependencies before configuring. */
    bool Bad = false, Changed = false;
    bool Bad = false, Changed = false;
-   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
    unsigned int i=0;
    unsigned int i=0;
    std::list<DepIterator> needConfigure;
    std::list<DepIterator> needConfigure;
    do
    do
@@ -628,7 +628,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
       This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
       This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
       or by the ConfigureAll call at the end of the for loop in OrderInstall. */
       or by the ConfigureAll call at the end of the for loop in OrderInstall. */
    bool Changed = false;
    bool Changed = false;
-   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
    unsigned int i = 0;
    unsigned int i = 0;
    do 
    do 
    {
    {

+ 3 - 0
debian/changelog

@@ -1,7 +1,10 @@
 apt (0.9.9.1) UNRELEASED; urgency=low
 apt (0.9.9.1) UNRELEASED; urgency=low
 
 
+  [ Michael Vogt ]
   * debian/rules:
   * debian/rules:
     - call dh_clean in clean (closes: #714980)
     - call dh_clean in clean (closes: #714980)
+  * apt-pkg/packagemanager.cc:
+    - increate APT::pkgPackageManager::MaxLoopCount to 5000
 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 05 Jul 2013 16:39:34 +0200
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 05 Jul 2013 16:39:34 +0200