* debian/changelog: updated credits

* apt-pkg/deb/dpkgpm.cc: merged from dpkg-log branch

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index befd9124c1de5817b2abe5f63014e71410e58acb..08c95b7a4f9d9c7f5780639aa71126c69efa8334 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -846,12 +846,14 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 
         if(stopOnError) 
         {
 
         if(stopOnError) 
         {

-           fclose(term_out);
+           if(term_out)
+              fclose(term_out);

            return false;
         }
       }      
    }
            return false;
         }
       }      
    }

-   fclose(term_out);
+   if(term_out)
+      fclose(term_out);

 
    if (RunScripts("DPkg::Post-Invoke") == false)
       return false;
 
    if (RunScripts("DPkg::Post-Invoke") == false)
       return false;

diff --git a/debian/changelog b/debian/changelog
index 02b637553d450d4fc2b6a3e3f014d3848332a73c..a2dafbaeaa0af45cab49ed77807c31b8e010c92a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,11 @@ apt (0.7.6ubuntu1) gutsy; urgency=low
     - only send LastModified if we actually have one
     - send range request with if-range 
     - delete failed downloads
     - only send LastModified if we actually have one
     - send range request with if-range 
     - delete failed downloads

+    (thanks to Thom May for his help here)

   * apt-pkg/deb/dpkgpm.{cc,h}:
     - merged dpkg-log branch, this lets you specify a 
       Dir::Log::Terminal file to log dpkg output to
   * apt-pkg/deb/dpkgpm.{cc,h}:
     - merged dpkg-log branch, this lets you specify a 
       Dir::Log::Terminal file to log dpkg output to

-      (ABI break)
+    (ABI break)

   * merged apt--sha256 branch to fully support the new
     sha256 checksums in the Packages and Release files
     (ABI break)
   * merged apt--sha256 branch to fully support the new
     sha256 checksums in the Packages and Release files
     (ABI break)