svn commit: samba r8471 - in branches/SAMBA_4_0/source/build/pidl: .

tridge at samba.org tridge at samba.org
Thu Jul 14 13:44:54 GMT 2005


Author: tridge
Date: 2005-07-14 13:44:54 +0000 (Thu, 14 Jul 2005)
New Revision: 8471

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8471

Log:
--ejs taking an optional arguments interferes with the pidl extra args

Modified:
   branches/SAMBA_4_0/source/build/pidl/pidl


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/pidl
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/pidl	2005-07-14 13:33:17 UTC (rev 8470)
+++ branches/SAMBA_4_0/source/build/pidl/pidl	2005-07-14 13:44:54 UTC (rev 8471)
@@ -105,7 +105,7 @@
 	    '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 @@
 	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));
 	}
 



More information about the samba-cvs mailing list