diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2009-12-22 12:20:43 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2009-12-22 12:20:43 +0100 |
| commit | a7b33d6543ac4dcf7fc40b38301f7cc9e22db3d2 (patch) | |
| tree | 163fe56653b31d1be91c1d728a2217ff1a7f6840 /apt-pkg | |
| parent | 79d006e6fbfb07049edfefa45a3bad19bf346746 (diff) | |
| parent | d0cf6da810b2ad898c0eb75ac8815ab5e56cf015 (diff) | |
merge with lp:~mvo/apt/sid to get the finale 0.7.25 state
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/init.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 6eb3b40ac..d1a275a47 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -879,7 +879,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) const char *s = _("Can not write log, openpty() " "failed (/dev/pts not mounted?)\n"); fprintf(stderr, "%s",s); - fprintf(term_out, "%s",s); + if(term_out) + fprintf(term_out, "%s",s); master = slave = -1; } else { struct termios rtt; diff --git a/apt-pkg/init.h b/apt-pkg/init.h index dde4cf679..f0757f644 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -21,9 +21,7 @@ // reverse-dependencies of libapt-pkg against the new SONAME. // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak -// FIXME: this needs to be changed to "4" (without quotes) on the next -// ABI break -#define APT_PKG_MAJOR libc6.10-6-4 +#define APT_PKG_MAJOR 4 #define APT_PKG_MINOR 8 #define APT_PKG_RELEASE 0 |