Comment out check for cyclic dependencies. Some thorns need to

require capabilities that they provide themselves, which is flagged as
error by this check.  Discussion about this is on the developers'
mailing list; I expect this problem to be resolved soon.


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

1 files changed, 27 insertions, 18 deletions

diff --git a/lib/sbin/ConfigurationParser.pl b/lib/sbin/ConfigurationParser.pl
index 41500f50..f9df527a 100644
--- a/lib/sbin/ConfigurationParser.pl
+++ b/lib/sbin/ConfigurationParser.pl
@@ -111,24 +111,33 @@ sub CreateConfigurationDatabase
     }
   }
 
-# Check for cyclic dependencies
-# create a hash with thorn-> used thorns (no prefix)
-  foreach $thorn (sort keys %thorns)
-  {
-    $thorn_dependencies{uc($thorn)}=$cfg{"\U$thorn\E USES THORNS"};
-  }
-
-  $message = &find_dep_cycles(%thorn_dependencies);
-  
-  if ("" ne  $message)
-  {
-   $message  =~ s/^\s*//g;
-   $message  =~ s/\s*$//g;
-   $message =~ s/\s+/->/g;
-   $message = "Found a cyclic dependency in configuration requirements:".$message."\n";
-   &CST_error(0,$message,$hint,__LINE__,__FILE__);
-  }
-
+# Disable the check for cyclic dependencies.
+# The code is very useful in principle, and will probably be re-enabled
+# soon (today is 2005-08-23), so I keep it, but comment it out.
+# Unfortunately, there is currently code that needs to have these cyclic
+# dependencies, so it is not possible to abort and not desirable to warn
+# for these cases.
+# Any problems with cyclic dependencies will be reported by the linker
+# later anyway.
+#
+## Check for cyclic dependencies
+## create a hash with thorn-> used thorns (no prefix)
+#  foreach $thorn (sort keys %thorns)
+#  {
+#    $thorn_dependencies{uc($thorn)}=$cfg{"\U$thorn\E USES THORNS"};
+#  }
+#
+#  $message = &find_dep_cycles(%thorn_dependencies);
+#  
+#  if ("" ne  $message)
+#  {
+#   $message  =~ s/^\s*//g;
+#   $message  =~ s/\s*$//g;
+#   $message =~ s/\s+/->/g;
+#   $message = "Found a cyclic dependency in configuration requirements:".$message."\n";
+#   &CST_error(0,$message,$hint,__LINE__,__FILE__);
+#  }
+#
 
 #  # Print configuration database
 #     my($field);