From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 3 Aug 2007 12:53:51 +0000 (+0200)
Subject: * apt-pkg/init.cc:
X-Git-Tag: 0.7.24ubuntu1~162^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/608c766dc110493b952a615c3eb82c3cf3ed8b90?ds=inline;hp=-c

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

608c766dc110493b952a615c3eb82c3cf3ed8b90
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index aa840f85e..94215197c 100644
--- 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 2617603ec..cc3c1f01c 100644
--- 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;