# HG changeset patch # User Pascal Bellard # Date 1470061514 -7200 # Node ID 07ef2e1b427335659241b53c6948b8c91f5f5c4d # Parent 169627386f16130b201a373b46c6b33132ed640c Restore AUTO_INSTALL_DEPS behaviour diff -r 169627386f16 -r 07ef2e1b4273 modules/install --- a/modules/install Mon Jul 25 11:21:49 2016 +0200 +++ b/modules/install Mon Aug 01 16:25:14 2016 +0200 @@ -128,13 +128,11 @@ "$num")" - if [ -n "$quiet" ]; then + if [ "$AUTO_INSTALL_DEPS" == 'yes' ] || [ -n "$quiet" ]; then # Quietly not display anything. Assume 'yes' unless '--noconfirm' is provided answer=0 [ -n "$noconfirm" ] && answer=1 else - [ "$AUTO_INSTALL_DEPS" == 'yes' ] && yes='yes' - # Display question; wait for answer or print auto-answer newline confirm "$(_ 'Install all missing dependencies? (y/N)')" diff -r 169627386f16 -r 07ef2e1b4273 modules/remove --- a/modules/remove Mon Jul 25 11:21:49 2016 +0200 +++ b/modules/remove Mon Aug 01 16:25:14 2016 +0200 @@ -123,7 +123,7 @@ fi # Confirmation -if [ -n "$noconfirm$yes" ] || im && [ -z "$auto" ]; then +if [ -n "$noconfirm" ] || im && [ -z "$auto" ]; then confirm "$(_ 'Remove package "%s" (%s)? (y/N)' "$PACKAGE" "$VERSION$EXTRAVERSION")" if [ "$?" -ne 0 ]; then newline; _ 'Uninstallation of package "%s" cancelled.' "$PACKAGE"