* apt-pkg/init.cc:

  - init Dir::Log::Terminal
* apt-pkg/deb/dpkgpm.cc:
  - only work with term_out if it is not NULL

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index aa840f85efccbf3000980af3224f7df3f021293b..94215197c4b4530e1fc4cf1aed5d9945b759aeac 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -843,12 +843,14 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 
         if(stopOnError) 
         {
-           fclose(term_out);
+           if(term_out)
+              fclose(term_out);
            return false;
         }
       }      
    }
-   fclose(term_out);
+   if(term_out)
+      fclose(term_out);
 
    if (RunScripts("DPkg::Post-Invoke") == false)
       return false;

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 2617603ec140e7878186c5a24da89eac8ac8e0b0..cc3c1f01c94dc7405c091153e69e90f4e87491c0 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -77,7 +77,7 @@ bool pkgInitConfig(Configuration &Cnf)
 
    // State   
    Cnf.Set("Dir::Log","var/log/apt");
-   Cnf.Set("Dir::Log::Name","term.log");
+   Cnf.Set("Dir::Log::Terminal","term.log");
    
    bool Res = true;