Author: eelco
Date: Wed May 11 12:22:00 2011
New Revision: 27219
URL: https://svn.nixos.org/websvn/nix/?rev=27219&sc=1
Log:
* Don't do magic abbreviating and case-insensitivity of options.
Modified:
cloud/trunk/src/nixos-deploy-network.pl
Modified: cloud/trunk/src/nixos-deploy-network.pl
==============================================================================
--- cloud/trunk/src/nixos-deploy-network.pl Wed May 11 11:06:57 2011
(r27218)
+++ cloud/trunk/src/nixos-deploy-network.pl Wed May 11 12:22:00 2011
(r27219)
@@ -6,7 +6,7 @@
use Cwd;
use File::Basename;
use JSON;
-use Getopt::Long qw(:config auto_version);
+use Getopt::Long qw(:config posix_default gnu_getopt no_ignore_case
auto_version);
use Text::Table;
use List::MoreUtils qw(uniq);
@@ -42,6 +42,23 @@
my $killObsolete = 0;
+sub main {
+ my $op = \&opDeploy;
+
+ exit 1 unless GetOptions(
+ "state|s=s" => \$stateFile,
+ "info|i" => sub { $op = \&opInfo; },
+ "check|c" => sub { $op = \&opCheck; },
+ "destroy" => sub { $op = \&opDestroy; },
+ "kill-obsolete|k!" => \$killObsolete,
+ );
+
+ @networkExprs = @ARGV;
+
+ &$op();
+}
+
+
# ‘--info’ shows the current deployment specification and state.
sub opInfo {
eval { evalMachineInfo(); }; warn $@ if $@;
@@ -142,23 +159,6 @@
}
-sub main {
- my $op = \&opDeploy;
-
- exit 1 unless GetOptions(
- "state=s" => \$stateFile,
- "info" => sub { $op = \&opInfo; },
- "check" => sub { $op = \&opCheck; },
- "destroy" => sub { $op = \&opDestroy; },
- "kill-obsolete!" => \$killObsolete,
- );
-
- @networkExprs = @ARGV;
-
- &$op();
-}
-
-
sub evalMachineInfo {
my $machineInfoXML =
`nix-instantiate --eval-only --xml --strict
$myDir/eval-machine-info.nix --arg networkExprs '[ @networkExprs ]' -A
machineInfo`;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
