[LON-CAPA-cvs] cvs: loncom / lond

[banghart]

banghart		Tue Jun 28 15:06:13 2005 EDT

  Modified files:              
    /loncom	lond 
  Log:
  		Meta files and locked files no longer contribute
  		to disk quota.
  
  
Index: loncom/lond
diff -u loncom/lond:1.289 loncom/lond:1.290
--- loncom/lond:1.289	Mon Jun 27 18:32:37 2005
+++ loncom/lond	Tue Jun 28 15:06:10 2005
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.289 2005/06/27 22:32:37 albertel Exp $
+# $Id: lond,v 1.290 2005/06/28 19:06:10 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.289 $'; #' stupid emacs
+my $VERSION='$Revision: 1.290 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1367,8 +1367,8 @@
 	#  assurance double sure, 
 	# use execute_command to ensure that the command is not executed in
 	# a shell that can screw us up.
-
-	my $duout = execute_command("du -ks $ududir");
+        my $file_list =  execute_command("find $ududir -not -regex '.*\.[0-9]+\.[^\.]+' -not -name '*.meta' -print");
+	my $duout = execute_command("du -ks $file_list");
 	$duout=~s/[^\d]//g; #preserve only the numbers
 	&Reply($client,"$duout\n","$cmd:$ududir");
     } else {