diff options
| author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-09-17 09:45:45 +0000 |
|---|---|---|
| committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-09-17 09:45:45 +0000 |
| commit | 34563977d44013c1c7d0fb68657e7adf12c1fb37 (patch) | |
| tree | 7b6bc876ec670215622112ff3a4996ce57e82a0e /lib/sbin/CST | |
| parent | 11b73e7fa12b73b55a8ee0c7187b01f3a538ee02 (diff) | |
Don't stop if the thorn list contains identical thorns from identical packages.
Added better error message for duplicate thorn names
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1822 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin/CST')
| -rw-r--r-- | lib/sbin/CST | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/sbin/CST b/lib/sbin/CST index c1ca66fb..e18e0617 100644 --- a/lib/sbin/CST +++ b/lib/sbin/CST @@ -6,7 +6,7 @@ # @desc # Parses the the configuration files for thorns. # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.38 2000-08-31 14:03:00 goodale Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.39 2000-09-17 09:45:45 allen Exp $ #@@*/ # Global parameter to track the number of errors from the CST @@ -252,8 +252,17 @@ sub CreateThornList { if( $thornlist{"$thorn_name"} ) { - $message = "Duplicate thorn $thorn_name"; - &CST_error(0,$message,__LINE__,__FILE__); + $thornlist{"$thorn_name"} =~ m:.*/(.*)/[^/]*$:; + if ($package ne $1) + { + $message = "Duplicate thornname $thorn_name in $1 and $package"; + &CST_error(0,$message,__LINE__,__FILE__); + } + else + { + $message = "Ignoring duplicate thorn $package/$thorn_name"; + &CST_error(1,$message,__LINE__,__FILE__); + } } else { |