From: Michael Vogt <mvo@debian.org>
Date: Fri, 27 Dec 2013 23:30:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/bugfix/bts731738-fancy-progess' into bugfix... 
X-Git-Tag: 0.9.14.2~3^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e5c2b7e8a5455e1dc6993ef9e151b3845fb53c60

Merge remote-tracking branch 'origin/bugfix/bts731738-fancy-progess' into bugfix/bts731738-fancy-progess

Conflicts:
	apt-pkg/install-progress.cc
---

e5c2b7e8a5455e1dc6993ef9e151b3845fb53c60
diff --cc apt-pkg/install-progress.cc
index bfc00bd06,2215fb1f5..0e093a511
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@@ -295,14 -273,18 +295,12 @@@ void PackageManagerFancy::HandleSIGWINC
     SetupTerminalScrollArea(nr_terminal_rows);
  }
  
 -void PackageManagerFancy::Start(int child_pty)
 +void PackageManagerFancy::Start(int a_child_pty)
  {
 +   child_pty = a_child_pty;
     int nr_terminal_rows = GetNumberTerminalRows();
     if (nr_terminal_rows > 0)
--   {
        SetupTerminalScrollArea(nr_terminal_rows);
 -      // *cough*
 -      struct winsize win;
 -      ioctl(child_pty, TIOCGWINSZ, (char *)&win);
 -      win.ws_row = nr_terminal_rows - 1;
 -      ioctl(child_pty, TIOCSWINSZ, (char *)&win);
--   }
  }
  
  void PackageManagerFancy::Stop()