Mercurial > octave-nkf
changeset 14517:ed2d670a0a50
Restore original behaviour of pkg install -noauto.
* scripts/pkg/private/install.m: give precedence to -noauto option
specified at install time over the option specified in the package
DESCRIPTION.
| author | Carlo de Falco <cdf@users.sourceforge.net> |
|---|---|
| date | Tue, 03 Apr 2012 07:25:44 +0200 |
| parents | df4cf520cbde |
| children | 67e865f5272c |
| files | scripts/pkg/private/install.m |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/pkg/private/install.m Mon Apr 02 17:14:18 2012 -0700 +++ b/scripts/pkg/private/install.m Tue Apr 03 07:25:44 2012 +0200 @@ -268,7 +268,7 @@ && any (strcmpi (a, str_true)))); endif - if (autoload > 0 || desc_autoload) + if (autoload > 0 || (autoload == 0 && desc_autoload)) fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", ".autoload"), "wt")); descriptions{i}.autoload = 1;