Synchronize with potato-branch again:

debian/changelog: update to 1.6.10
scripts/dpkg-divert.pl: reinstate last writeability-patch. Modified
to not abort on ENOENT: this indicates a directory does not (yet)
exist. If this happens don't try to rename.
scripts/update-alternatives.pl:
+ update usage-warning to reflect the new --config option
+ Document some global variables
+ Switch back to auto-mode when removing a manually selected alternative
dselect/{dselect.h,main.cc,pkglist.cc}: remove CAN_RESIZE stuff
dselect/methlist.cc: don't abort if getch fails due to interrupted syscall
dselect/pkglist.cc: don't abort if getch fails due to interrupted syscall
dselect/baselist.cc: put debug-statement in sigwinchhandler and
actually resize the current terminal before redisplaying the screen

1 files changed, 3 insertions, 4 deletions

diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index ac493a6cf..b0c82adee 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -24,6 +24,7 @@
 #include <curses.h>
 #include <assert.h>
 #include <signal.h>
+#include <errno.h>
 
 extern "C" {
 #include <config.h>
@@ -497,15 +498,13 @@ pkginfo **packagelist::display() {
 
   if (debug) fprintf(debug,"packagelist[%p]::display() entering loop\n",this);
   for (;;) {
-#if CAN_RESIZE
-    if (interrupted)
-      adjust(0);
-#endif
     if (whatinfo_height) wcursyncup(whatinfowin);
     if (doupdate() == ERR) ohshite("doupdate failed");
     signallist= this;
     if (sigprocmask(SIG_UNBLOCK,&sigwinchset,0)) ohshite("failed to unblock SIGWINCH");
+    do
     response= getch();
+    while (response == ERR && errno == EINTR);
     if (sigprocmask(SIG_BLOCK,&sigwinchset,0)) ohshite("failed to re-block SIGWINCH");
     if (response == ERR) ohshite("getch failed");
     interp= (*bindings)(response);