Allow a configuration.ccl file for the flesh

The mechanism in Cactus that handles configuration.ccl files currently
cannot handle a configuration.ccl for the flesh. This patch corrects
this.


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

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/sbin/CST b/lib/sbin/CST
index 0032b499..d19a357f 100644
--- a/lib/sbin/CST
+++ b/lib/sbin/CST
@@ -331,14 +331,15 @@ sub CreateMakeThornlist
 
   foreach $thorn (sort keys %$thorns)
   {
-    if($config->{"\U$thorn\E OPTIONS"} ne 'NO_SOURCE' &&
-      $thorn ne 'Cactus')
+    next if $thorn eq 'Cactus';
+
+    if($config->{"\U$thorn\E OPTIONS"} ne 'NO_SOURCE')
     {
       $thorns->{$thorn} =~ m:.*/(.*/.*):;
       $thornlist .= " $1";
     }
 
-    if( -r "$thorns->{$thorn}/configuration.ccl")
+    if(-r "$thorns->{$thorn}/configuration.ccl")
     {
       $thorns->{$thorn} =~ m:.*/(.*/.*):;
       $config_thornlist .= " $1";