From 84936f9e8bbf8f3e3d04fce50a273ad356b594db Mon Sep 17 00:00:00 2001
From: rhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Sun, 17 Jun 2012 22:20:35 +0000
Subject: remove accidentally commited duplicate capabilites handling code

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4837 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 lib/sbin/ConfigurationParser.pl | 28 ----------------------------
 1 file changed, 28 deletions(-)

(limited to 'lib')

diff --git a/lib/sbin/ConfigurationParser.pl b/lib/sbin/ConfigurationParser.pl
index 533ecde0..59ebba53 100644
--- a/lib/sbin/ConfigurationParser.pl
+++ b/lib/sbin/ConfigurationParser.pl
@@ -158,34 +158,6 @@ sub CreateConfigurationDatabase
     &CST_error(0, $message);
   }
 
-  # Turn optional capabilities into required capabilities, if the
-  # capability is provided. This way we don't have to treat required
-  # and optional requirements differently.
-  my %providedcaps;
-  foreach my $thorn (sort keys %thorns)
-  {
-      if ($cfg{"\U$thorn\E PROVIDES"})
-      {
-          foreach my $providedcap (split (' ', $cfg{"\U$thorn\E PROVIDES"}))
-          {
-              $providedcaps{$providedcap} = 1;
-          }
-      }
-  }
-  foreach my $thorn (sort keys %thorns)
-  {
-      if ($cfg{"\U$thorn\E OPTIONAL"})
-      {
-          foreach my $optionalcap (split (' ', $cfg{"\U$thorn\E OPTIONAL"}))
-          {
-              if ($providedcaps{$optionalcap})
-              {
-                  $cfg{"\U$thorn\E REQUIRES"} .= " $optionalcap";
-              }
-          }
-      }
-  }
-
   return \%cfg;
 }
 
-- 
cgit v1.2.3