Checkout the README dir in an arrangement before checking out a thorn, this

solves the CVSROOT/Emptydir problem in the Repository file of each arrangement.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1773 17b73243-c579-4c4c-a9d2-2d5706c11dac

2 files changed, 39 insertions, 3 deletions

diff --git a/lib/sbin/CheckoutUtils.pl b/lib/sbin/CheckoutUtils.pl
index 39d2afd9..53fca963 100644
--- a/lib/sbin/CheckoutUtils.pl
+++ b/lib/sbin/CheckoutUtils.pl
@@ -378,11 +378,21 @@ sub GetThorns
     else
     {
       $command_co = "cvs $cvs_options -d $thorns{\"$th\"} co $tag $th |";
+      #Get arrangements name
+      $arrangement = $th;
+      $arrangement =~ s:/[^/]*$::;
+      $command_co_arr = "cvs $cvs_options -d $thorns{\"$th\"} co $tag $arrangement/README |";
+
       if ($debug != 1)
       {
 	# Check that the repository exists
 	DIE("Repository $thorns{\"$th\"} not found \n Are you connected to the network?\n Is the repository name spelt right in your thornlist file?") if (!&RepositoryExists($thorns{"$th"}));
 	
+	open(CVSCO,$command_co_arr);
+	while (<CVSCO>)
+	{
+	  print $_;  
+	}
 	open(CVSCO,$command_co);
 	while (<CVSCO>)
 	{
diff --git a/lib/sbin/checkout.pl b/lib/sbin/checkout.pl
index f90019a3..c11a837b 100644
--- a/lib/sbin/checkout.pl
+++ b/lib/sbin/checkout.pl
@@ -284,6 +284,9 @@ sub get_thorns
       
       for ($i=$first; $i<$last+1; $i++)
 	{
+	  $arrangement = $name{$i};
+	  $arrangement =~ s:/[^/]*$::;
+	  &CheckOutREADME("$arrangement/README");
 	  &CheckOut($name{$i});
 	}
     }
@@ -328,9 +331,10 @@ sub get_thornlist
 	print "  $_";
       }
       close LISTS;
-      print "\n Choose ThornList : ";
+      print "\nChoose ThornList : ";
       
       $thornlist = <>;
+      print "\n";
       chomp($thornlist);
       if (!-e "thornlists/$thornlist")
       {
@@ -397,6 +401,30 @@ sub CheckOut
 }
 
 #/*@@
+#  @routine    CheckoutREADME
+#  @date       Sat Jul  20 16:38:52 2000
+#  @author     Gabrielle Allen
+#  @desc 
+#  
+#  @enddesc 
+#  @calls     
+#  @calledby   
+#  @history 
+#
+#  @endhistory 
+#
+#@@*/
+sub CheckOutREADME
+{
+  my($file) = @_;
+
+  open(MODULES,"cvs -z9 -q checkout $file |");
+  @dummy = <MODULES>;
+  close(MODULES);
+
+}
+
+#/*@@
 #  @routine    PrintInfo
 #  @date       Sat Jul  3 16:38:52 1999
 #  @author     Gabrielle Allen
@@ -414,7 +442,6 @@ sub PrintInfo
 {
   print "\n";
   print "Type \"help\" at any prompt for a description on how\nto use this script\n\n";
-  print "Developmental thorns/arrangements are labelled (dev)\n";
   print "________________________________________________________________________\n\n";
 }    
 
@@ -477,7 +504,6 @@ sub RepositoryExists
 
   return !$?;
 
-
 }