diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-08-03 15:01:18 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-08-03 15:01:18 +0200 |
| commit | b3aac1bb35d4f8e11ffc45462f450632de9a571f (patch) | |
| tree | 3ac05a08fe61f413fae9b1354feed78bc7bdac10 | |
| parent | f060e833f53ba3ed0024f8a2bebfc78e8aa552f2 (diff) | |
* debian/changelog: updated credits
* apt-pkg/deb/dpkgpm.cc: merged from dpkg-log branch
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index befd9124c..08c95b7a4 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/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; diff --git a/debian/changelog b/debian/changelog index 02b637553..a2dafbaea 100644 --- 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 + (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) |