summaryrefslogtreecommitdiff
path: root/apt-pkg/deb/dpkgpm.cc
diff options
context:
space:
mode:
authorMichael Vogt <egon@bottom>2008-02-21 16:49:03 +0100
committerMichael Vogt <egon@bottom>2008-02-21 16:49:03 +0100
commit0252c6beaab880081c1dc491bfe0904614a1baa7 (patch)
tree3a31cbb1530a99a5f936dad9d5c3345a5cb90890 /apt-pkg/deb/dpkgpm.cc
parente3a1f08d41bf6ef6a42bbc6e5f8e20f7b4aa37a0 (diff)
parent7810fc042d4d3dda6b2c721d09d3eb7eadc12e2d (diff)
* cmdline/apt-key:
- add support for a master-keyring that contains signing keys that can be used to sign the archive signing keys. This should make key-rollover easier. * apt-pkg/deb/dpkgpm.cc: - merged patch from Kees Cook to fix anoying upper-case display on amd64 in sbuild * apt-pkg/algorithms.cc: - add APT::Update::Post-Invoke-Success script slot - Make the breaks handling use the kill list. This means, that a Breaks: Pkg (<< version) may put Pkg onto the remove list. * apt-pkg/deb/debmetaindex.cc: - add missing "Release" file uri when apt-get update --print-uris is run * methods/connect.cc: - remember hosts with Resolve failures or connect Timeouts
Diffstat (limited to 'apt-pkg/deb/dpkgpm.cc')
-rw-r--r--apt-pkg/deb/dpkgpm.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 34e166447..bc15b8819 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -702,14 +702,16 @@ bool pkgDPkgPM::Go(int OutStatusFd)
sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
struct termios tt;
+ struct termios tt_out;
struct winsize win;
int master;
int slave;
// FIXME: setup sensible signal handling (*ick*)
tcgetattr(0, &tt);
+ tcgetattr(1, &tt_out);
ioctl(0, TIOCGWINSZ, (char *)&win);
- if (openpty(&master, &slave, NULL, &tt, &win) < 0)
+ if (openpty(&master, &slave, NULL, &tt_out, &win) < 0)
{
const char *s = _("Can not write log, openpty() "
"failed (/dev/pts not mounted?)\n");