Просмотр исходного кода

Added the ability to disable immediate configuration
Author: jgg
Date: 1999-01-31 04:25:35 GMT
Added the ability to disable immediate configuration

Arch Librarian лет назад: 22
Родитель
Сommit
079cc404f4
3 измененных файлов с 14 добавлено и 3 удалено
  1. 5 2
      apt-pkg/packagemanager.cc
  2. 7 0
      doc/apt.conf.5.yo
  3. 2 1
      doc/examples/apt.conf

+ 5 - 2
apt-pkg/packagemanager.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: packagemanager.cc,v 1.10 1998/12/10 04:22:46 jgg Exp $
+// $Id: packagemanager.cc,v 1.11 1999/01/31 04:25:35 jgg Exp $
 /* ######################################################################
 
    Package Manager - Abstacts the package manager
@@ -107,11 +107,14 @@ bool pkgPackageManager::CreateOrderList()
    delete List;
    List = new pkgOrderList(Cache);
    
+   bool NoImmConfigure = _config->FindB("APT::Immedate-Configure",false);
+   
    // Generate the list of affected packages and sort it
    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
       // Mark the package for immediate configuration
-      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
+      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential &&
+	  NoImmConfigure == false)
       {
 	 List->Flag(I,pkgOrderList::Immediate);
 	 

+ 7 - 0
doc/apt.conf.5.yo

@@ -47,6 +47,13 @@ dit(bf(Ignore-Hold))
 Ignore Held packages; This global options causes the problem resolver to
 ignore held packages in its decision making. 
 
+dit(bf(Immedate-Configure))
+Disable Immedate Configuration; This dangerous option disables some
+of APT's ordering code to cause it to make fewer dpkg calls. Doing
+so may be necessary on some extremely slow single user systems but 
+is very dangerous and may cause package install scripts to fail or worse.
+Use at your own risk.
+
 dit(bf(Get))
 The Get subsection controls the bf(apt-get(8)) tool, please see its
 documentation for more information about the options here.

+ 2 - 1
doc/examples/apt.conf

@@ -1,4 +1,4 @@
-// $Id: apt.conf,v 1.20 1999/01/30 08:08:54 jgg Exp $
+// $Id: apt.conf,v 1.21 1999/01/31 04:25:35 jgg Exp $
 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is a completely
    valid file.
@@ -45,6 +45,7 @@ APT {
 
   // Some general options
   Ingore-Hold "false";
+  Immedate-Configure "true";        // DO NOT turn this off, see the man page
 };
 
 // Options for the downloading routines