d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- change ALWAYS_ASSUME_YES to ASSUME_ALWAYS_YES for consistency with pkg(8)

Browse Source 
- if not on a tty prompt about the missing pkg(8) but default on 'no' except if
  ASSUME_ALWAYS_YES is set

MFC after:	2 days
This commit is contained in:
Baptiste Daroussin 2012-08-24 21:08:56 +00:00
parent b7005313dd
commit 3a480126c4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/pkg/pkg.c
View File

@ -425,10 +425,12 @@ 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 (pkg_query_yes_no() == 0)
if (isatty(fileno(stdin)) &&
pkg_query_yes_no() == 0)
exit(EXIT_FAILURE);
else
exit(EXIT_FAILURE);
}
if (bootstrap_pkg() != 0)