Attachment 157431 Details for Bug 237356 – fix for section.param=value command line args

fix for section.param=value command line args

attachment (text/plain), 1.53 KB, created by Rich Megginson on 2007-06-19 23:27:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-06-19 23:27:21 UTC

Size: 1.53 KB

patch

obsolete

>Fix Description: Allow the use of '-' and '_' in section and parameter names when passing in inf parameters via the command line.
>Platforms tested: RHEL4
>Flag Day: no
>Doc impact: no
>
>Index: ds_newinst.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl.in,v
>retrieving revision 1.8
>retrieving revision 1.9
>diff -u -r1.8 -r1.9
>--- ds_newinst.pl.in	15 Jun 2007 22:11:15 -0000	1.8
>+++ ds_newinst.pl.in	19 Jun 2007 23:24:58 -0000	1.9
>@@ -189,7 +189,7 @@
> 
> # process command line arguments
> for (@ARGV) {
>-    if (/^(\w+)\.(\w+)=(.*)$/) { # e.g. section.param=value
>+    if (/^([\w_-]+)\.([\w_-]+)=(.*)$/) { # e.g. section.param=value
>         $table{$1}->{$2} = $3;
>     } else { # file?
>         readInfFile($_);
>
>ndex: Setup.pm.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Setup.pm.in,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -r1.4 -r1.5
>--- Setup.pm.in	19 Jun 2007 18:24:57 -0000	1.4
>+++ Setup.pm.in	19 Jun 2007 23:24:58 -0000	1.5
>@@ -148,7 +148,7 @@
>     # arguments override those passed in via an inf file - this
>     # allows the reuse of .inf files with some parameters overridden
>     for (@ARGV) {
>-        if (/^(\w_-+)\.(\w_-+)=(.*)$/) { # e.g. section.param=value
>+        if (/^([\w_-]+)\.([\w_-]+)=(.*)$/) { # e.g. section.param=value
>             $self->{inf}->{$1}->{$2} = $3;
>         } else { # error
>             print STDERR "Error: unknown command line option $_\n";

Actions: View

Attachments on bug 237356: 153230 | 153562 | 153667 | 153668 | 153674 | 153675 | 153677 | 153678 | 155103 | 155105 | 155406 | 155407 | 155408 | 155409 | 155410 | 155411 | 155412 | 155413 | 155414 | 155483 | 155484 | 155485 | 155486 | 155487 | 155488 | 155489 | 155490 | 156389 | 156510 | 156525 | 156539 | 156540 | 156541 | 156612 | 156613 | 156614 | 156626 | 156633 | 156634 | 156741 | 156829 | 156834 | 156839 | 156840 | 156895 | 157043 | 157044 | 157133 | 157159 | 157160 | 157164 | 157165 | 157167 | 157298 | 157378 | 157381 | 157388 | 157390 | 157400 | 157401 | 157407 | 157408 | 157429 | 157431 | 157469 | 157471 | 157479 | 157480 | 160762