Parcourir la source

* debian/changelog: updated credits
* apt-pkg/deb/dpkgpm.cc: merged from dpkg-log branch

Michael Vogt il y a 19 ans
Parent
commit
b3aac1bb35
2 fichiers modifiés avec 6 ajouts et 3 suppressions
  1. 4 2
      apt-pkg/deb/dpkgpm.cc
  2. 2 1
      debian/changelog

+ 4 - 2
apt-pkg/deb/dpkgpm.cc

@@ -846,12 +846,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;

+ 2 - 1
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
+    (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
-      (ABI break)
+    (ABI break)
   * merged apt--sha256 branch to fully support the new
     sha256 checksums in the Packages and Release files
     (ABI break)