diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-18 16:53:22 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-18 16:53:22 +0100 |
| commit | c55451ff2e5a098a6431dfd1be322f7113a86002 (patch) | |
| tree | 4369cdb8cc209b1e44f81e978684992a68cd5dbc /apt-pkg | |
| parent | a0895a74fe95997a5d75e5b54c95afb9594554f6 (diff) | |
| parent | d0cf6da810b2ad898c0eb75ac8815ab5e56cf015 (diff) | |
merge from the debian-sid branch
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/init.h | 2 |
2 files changed, 3 insertions, 2 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 b3e4b147f..f0757f644 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -22,7 +22,7 @@ // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 9 +#define APT_PKG_MINOR 8 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; |