← Back to branch summary

~ubuntu-branches/ubuntu/vivid/newt/vivid

« back to all changes in this revision

Viewing changes to debian/patches/messagebox_escape.patch

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-11-08 14:50:00 UTC
  • mfrom: (2.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20121108145000-0yfrol7obct0jufq
Tags: 0.52.14-11ubuntu1
* Merge with Debian; remaining changes:
  - Port python module to python3.
  - Fix installation for multiple python3 versions.
  - Move libnewt to /lib and whiptail to /bin so they can be used by
    friendly-recovery on systems that have a separate /usr.
  - debian/libnewt0.52.install, debian/libnewt0.52.postinst,
    debian/palette => debian/palette.original:
    - move palette from /usr to /etc such that they can be edited by an
      admin.
* Configure --with-colorsfile=/etc/newt/palette.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/messagebox_escape.patch
 
1
Author: Alastair McKinstry <mckinstry@debian.org>
 
2
Description: Fix for bug: incorrect result given for <no> selected by ESC pressed in whiptail
 
3
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=#665784
 
4
Last-Updated: 2012-05-16
 
5
Forwarded: no
 
6
 
 
7
Index: newt-0.52.14/dialogboxes.c
 
8
===================================================================
 
9
--- newt-0.52.14.orig/dialogboxes.c     2012-05-16 12:15:50.000000000 +0100
 
10
+++ newt-0.52.14/dialogboxes.c  2012-05-16 12:16:29.000000000 +0100
 
11
@@ -568,7 +568,7 @@
 
12
 
 
13
        answer = newtFormGetCurrent(form);
 
14
 
 
15
-       if (answer == no)
 
16
+       if ((rc == DLG_OKAY) && (answer == no))
 
17
            return DLG_CANCEL;
 
18
     }
 
19
     else {