Sfoglia il codice sorgente

hide first pdiff merge failure debug message

The sibling of this message are all guarded as debug messages, just this
one had it missing an subsequently causes display issues if triggered.

Git-Dch: Ignore
David Kalnischkies 11 anni fa
parent
commit
f4c7a238f4
1 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 2 1
      apt-pkg/acquire-item.cc

+ 2 - 1
apt-pkg/acquire-item.cc

@@ -1044,7 +1044,8 @@ void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * Cnf
 
 
    // first failure means we should fallback
    // first failure means we should fallback
    State = StateErrorDiff;
    State = StateErrorDiff;
-   std::clog << "Falling back to normal index file acquire" << std::endl;
+   if (Debug)
+      std::clog << "Falling back to normal index file acquire" << std::endl;
    new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
    new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
 }
 }
 									/*}}}*/
 									/*}}}*/