diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-14 13:44:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:23:07 -0500 |
| commit | 7a7e271e0cd5556598645014db6c600ddb18c407 (patch) | |
| tree | e0ea7592b63758130b9e88e52a71b4624b4f99fb | |
| parent | f48a20b249bdc3db549e2295404db697c92a9798 (diff) | |
| download | samba-7a7e271e0cd5556598645014db6c600ddb18c407.tar.gz samba-7a7e271e0cd5556598645014db6c600ddb18c407.tar.bz2 samba-7a7e271e0cd5556598645014db6c600ddb18c407.zip | |
r8471: --ejs taking an optional arguments interferes with the pidl extra args
(This used to be commit a9d05af0fd802cf0cbe1298c3c988dcd2eb1b848)
| -rwxr-xr-x | source4/build/pidl/pidl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/pidl/pidl b/source4/build/pidl/pidl index ae46b4c746..9cf1e2f6d3 100755 --- a/source4/build/pidl/pidl +++ b/source4/build/pidl/pidl @@ -105,7 +105,7 @@ GetOptions ( 'client:s' => \$opt_client, 'eth-parser:s' => \$opt_eth_parser, 'eth-header:s' => \$opt_eth_header, - 'ejs:s' => \$opt_ejs, + 'ejs' => \$opt_ejs, 'diff' => \$opt_diff, 'odl' => \$opt_odl, 'keep:s' => \$opt_keep, @@ -253,10 +253,10 @@ sub process_file($) if (defined($opt_ejs)) { require Parse::Pidl::Samba::EJS; require Parse::Pidl::Samba::EJSHeader; - my $ejs = ($opt_ejs or Parse::Pidl::Util::ChangeExtension($output, "_ejs.c")); + my $ejs = Parse::Pidl::Util::ChangeExtension($output, "_ejs.c"); Parse::Pidl::Util::FileSave($ejs, Parse::Pidl::Samba::EJS::Parse($ndr, $h_filename)); - $ejs = ($opt_ejs or Parse::Pidl::Util::ChangeExtension($output, "_ejs.h")); + $ejs = Parse::Pidl::Util::ChangeExtension($output, "_ejs.h"); Parse::Pidl::Util::FileSave($ejs, Parse::Pidl::Samba::EJSHeader::Parse($ndr)); } |