Author: bapt
Date: Sun Sep 9 22:09:30 2012
New Revision: 240290
URL: http://svn.freebsd.org/changeset/base/240290
Log:
MFC: r239663, r239664
change ALWAYS_ASSUME_YES to ASSUME_ALWAYS_YES for consistency with pkg(8)
if not on a tty prompt about the missing pkg(8) but default on 'no' except if
ASSUME_ALWAYS_YES is set
Modified:
stable/9/usr.sbin/pkg/pkg.c
Directory Properties:
stable/9/usr.sbin/pkg/ (props changed)
Modified: stable/9/usr.sbin/pkg/pkg.c
==============================================================================
--- stable/9/usr.sbin/pkg/pkg.c Sun Sep 9 21:00:45 2012 (r240289)
+++ stable/9/usr.sbin/pkg/pkg.c Sun Sep 9 22:09:30 2012 (r240290)
@@ -425,9 +425,11 @@ main(__unused int argc, char *argv[])
* not tty. Check the environment to see if user has answer
* tucked in there already.
*/
- if (getenv("ALWAYS_ASSUME_YES") == NULL &&
- isatty(fileno(stdin))) {
+ if (getenv("ASSUME_ALWAYS_YES") == NULL) {
printf("%s", confirmation_message);
+ if (!isatty(fileno(stdin)))
+ exit(EXIT_FAILURE);
+
if (pkg_query_yes_no() == 0)
exit(EXIT_FAILURE);
}
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
