svn commit: samba r18291 - in branches/SAMBA_4_0/source/build/smb_build: .

metze at samba.org metze at samba.org
Sat Sep 9 08:17:49 GMT 2006


Author: metze
Date: 2006-09-09 08:17:48 +0000 (Sat, 09 Sep 2006)
New Revision: 18291

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

Log:
don't add ./ for files in the top dir '.'

metze
Modified:
   branches/SAMBA_4_0/source/build/smb_build/output.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-09-09 07:51:30 UTC (rev 18290)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-09-09 08:17:48 UTC (rev 18291)
@@ -12,12 +12,16 @@
 {
 	my ($dir,$files) = @_;
 	my @ret = ();
+	my $dirsep = "/";
 
+	$dir =~ s/^\.$//g;
 	$dir =~ s/^\.\///g;
+
+	$dirsep = "" if ($dir eq "");
 	
 	foreach (@$files) {
 		if (substr($_, 0, 1) ne "\$") {
-			$_ = "$dir/$_";
+			$_ = "$dir$dirsep$_";
 			s/([^\/\.]+)\/\.\.\///g;
 			s/([^\/\.]+)\/\.\.\///g;
 		}



More information about the samba-cvs mailing list