[vhffs-dev] [svn] commit: r95 - in /trunk: INSTALL README make_release make_release2 vhffs-api/src/Vhffs/Acl.pm vhffs-doc/INSTALL vhffs-rfc/ vhffs-rfc/README vhffs-rfc/largefile

[vhffs-dev@xxxxxxxxx]

Author: soda
Date: Mon Nov 14 01:25:09 2005
New Revision: 95

Log:
add rfcs


Added:
    trunk/INSTALL
    trunk/README
    trunk/vhffs-doc/INSTALL
    trunk/vhffs-rfc/
    trunk/vhffs-rfc/README
    trunk/vhffs-rfc/largefile
Modified:
    trunk/make_release
    trunk/make_release2
    trunk/vhffs-api/src/Vhffs/Acl.pm

Modified: trunk/make_release
==============================================================================
--- trunk/make_release (original)
+++ trunk/make_release Mon Nov 14 01:25:09 2005
@@ -1,6 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
 use strict;
+use IO::Handle;
 
 my $version = "4.0-RC5";
 my @files_to_delete = qw(backup.sh fixperm.sh);
@@ -73,7 +74,6 @@
 
 my $directory = ".";
 
-
 treat_dir( $directory );
 tar_distro( $directory );
 

Modified: trunk/make_release2
==============================================================================
--- trunk/make_release2 (original)
+++ trunk/make_release2 Mon Nov 14 01:25:09 2005
@@ -1,14 +1,16 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
 
 #Script to build VHFFS release
 
 use strict;
 use File::Copy;
+use IO::Handle;
 
 my $VERSION = "4.0rc8";
-my @files_to_delete = qw(backup.sh fixperm.sh make_release make_release2);
+my @files_to_delete = qw(backup.sh fixperm.sh make_release make_release2 svn-commit);
 my @files_to_package = qw( TODO Makefile Changelog AUTHORS vhffs-api vhffs-backend vhffs-doc vhffs-intl vhffs-listengine vhffs-panel vhffs-robots vhffs-shells debian vhffs-tools);
+my $VERBOSE = 0;
 
 sub treat_dir
 {
@@ -28,15 +30,15 @@
 		{
 			if( $file =~ /.*~$/)
 			{
-				print "does not include $complete\n";
+				print "does not include $complete\n" if( $VERBOSE == 1 );
 				$include = 0;
 			}
 
 			foreach( @files_to_delete )
 			{
-				if( $file eq $_ )
+				if( ( $file =~ /$_/ ) )
 				{
-					print "does not include $complete\n";
+					print "does not include $complete\n" if( $VERBOSE == 1 );
 					$include = 0;
 				}
 			}
@@ -54,20 +56,20 @@
 				if( $file eq $_ )
 				{
 					$include = 0;
-					print "does not include $complete\n";
+					print "does not include $complete\n" if( $VERBOSE == 1 );
 				}
 			}
 
 			if( $file eq "CVS" or $file eq ".svn")
 			{
 				$include = 0;
-				print "does not include $complete\n";
+				print "does not include $complete\n" if( $VERBOSE == 1 );
 			}
 			else
 			{
 				if( $include == 1)
 				{
-					print "Entering dir $complete\n";
+					print "Entering dir $complete\n" if( $VERBOSE == 1 );
 					mkdir( $work."/".$file );
 					treat_dir( $complete , $work."/".$file )
 				}
@@ -92,6 +94,7 @@
 	my $total = $commande." ".$output_file." vhffs-".$VERSION." 1>/dev/null 2>/dev/null";
 	system( "cd ".$work." && cd .. && " . $total );
 	system( "rm -rf $work");
+	return $output_file;
 }
 
 
@@ -108,13 +111,15 @@
 	system("rm -rf $tmp");
 	mkdir( $tmp ) if( ! -d $tmp );
 	return( $tmp );
-	
 }
 
 
 ##################
 # Main program
 #################
+
+my $directory = ".";
+my $ofile;
 
 my $tmpdir;
 
@@ -131,8 +136,10 @@
 
 my $workdir = create_workdir();
 
-print( $workdir );
 unlink( $sourcesdir ."/debian/files") if( -f $sourcesdir."/debian/files");
 treat_dir( $sourcesdir , $workdir );
-tar_distro( $workdir , $tmpdir );
+$ofile = tar_distro( $workdir , $tmpdir );
 
+print "VHFFS distribution available in: " . $ofile . "\n";
+
+

Modified: trunk/vhffs-api/src/Vhffs/Acl.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/Acl.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Acl.pm Mon Nov 14 01:25:09 2005
@@ -29,7 +29,6 @@
 	return -1 if( ( $entity->fetch < 0 ) || ( $object->fetch < 0 ) );
 
 	$perm = Vhffs::Constants::ACL_DENIED;
-	$result;
 	
 	$query = "SELECT perm FROM vhffs_acl WHERE oid_src='".$entity->{'object_id'}."' AND oid_dst='".$object->{'object_id'} ."'";
 	$request = $main->{'db'}->{'DB_READ'}->prepare( $query );