Date: Thu, 25 Oct 2012 21:04:11 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r242096 - in head/usr.sbin/bsdconfig: . security Message-ID: <201210252104.q9PL4BvW045467@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Thu Oct 25 21:04:11 2012 New Revision: 242096 URL: http://svn.freebsd.org/changeset/base/242096 Log: When Xdialog(1) is passed a NULL argument to its `--help' option, Xdialog(1) acts like dialog(1) in that it returns exit status 2 when the help button is chosen. Approved by: adri (co-mentor) (implicit) Modified: head/usr.sbin/bsdconfig/bsdconfig head/usr.sbin/bsdconfig/security/kern_securelevel Modified: head/usr.sbin/bsdconfig/bsdconfig ============================================================================== --- head/usr.sbin/bsdconfig/bsdconfig Thu Oct 25 20:45:57 2012 (r242095) +++ head/usr.sbin/bsdconfig/bsdconfig Thu Oct 25 21:04:11 2012 (r242096) @@ -189,7 +189,7 @@ dialog_menu_main() --ok-label \"\$msg_ok\" \ --cancel-label \"\$msg_exit_bsdconfig\" \ --help-button \ - ${USE_XDIALOG:+--help \"\$( f_include_help BSDCONFIG )\"} \ + ${USE_XDIALOG:+--help \"\"} \ --menu \"\$prompt\" $size $menu_list \ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) Modified: head/usr.sbin/bsdconfig/security/kern_securelevel ============================================================================== --- head/usr.sbin/bsdconfig/security/kern_securelevel Thu Oct 25 20:45:57 2012 (r242095) +++ head/usr.sbin/bsdconfig/security/kern_securelevel Thu Oct 25 21:04:11 2012 (r242096) @@ -76,7 +76,7 @@ dialog_menu_main() --ok-label \"\$msg_ok\" \ --cancel-label \"\$msg_cancel\" \ --help-button \ - ${USE_XDIALOG:+--help \"\$( f_include_help SECURELEVEL )\"} \ + ${USE_XDIALOG:+--help \"\"} \ --menu \"\$prompt\" $size \ $menu_list \ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210252104.q9PL4BvW045467>