Changeset 1136

Timestamp:

01/03/08 09:22:31 (11 months ago)

Author:

ask

Message:

• Make mogadm prefer command line settings over configuration file
  settings (Derek Boonstra)
  

Files:

• trunk/utils/Changes (modified) (1 diff)
• trunk/utils/mogadm (modified) (2 diffs)

trunk/utils/Changes

@@ +1 @@
+  * Make mogadm prefer command line settings over configuration file
+    settings (Derek Boonstra)
+
-  * Wire up fsck_reset's startpos argument. (Robin H. Johnson).
-

trunk/utils/mogadm

@@ -247 +247 @@
-# load up our config files
-my %opts;
-my @configs = ($opts{config}, "$ENV{HOME}/.mogilefs.conf", "/etc/mogilefs/mogilefs.conf");
-foreach my $fn (reverse @configs) {
-    next unless $fn && -e $fn;
-    open FILE, "<$fn"
-        or die "unable to open $fn: $!\n";
-    while (<FILE>) {
-        s/\#.*//;
-        next unless m!^\s*(\w+)\s*=\s*(.+?)\s*$!;
-        $opts{$1} = $2;
-    }
-    close FILE;
-}
-
-Getopt::Long::Configure("require_order", "pass_through");
@@ -269 +257 @@
-    ) or abortWithUsage();
-Getopt::Long::Configure("require_order", "no_pass_through");
+
+my @configs = ($opts{config}, "$ENV{HOME}/.mogilefs.conf", "/etc/mogilefs/mogilefs.conf");
+foreach my $fn (reverse @configs) {
+    next unless $fn && -e $fn;
+    open FILE, "<$fn"
+        or die "unable to open $fn: $!\n";
+    while (<FILE>) {
+        s/\#.*//;
+        next unless m!^\s*(\w+)\s*=\s*(.+?)\s*$!;
+        $opts{$1} = $2 unless ( defined $opts{$1} );
+    }
+    close FILE;
+}
-
-# bail for help