# HG changeset patch # User Carlo de Falco # Date 1333430744 -7200 # Node ID ed2d670a0a50613c47540c60efd9e1f0f7afe40b # Parent df4cf520cbde78183c5f6bddef50ff0d49811f8c 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. diff -r df4cf520cbde -r ed2d670a0a50 scripts/pkg/private/install.m --- 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;