summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac>2012-06-17 22:20:35 +0000
committerrhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac>2012-06-17 22:20:35 +0000
commit84936f9e8bbf8f3e3d04fce50a273ad356b594db (patch)
tree3c720e0f920cd2fc17cf49bfa3f9282a44c706ae /lib
parent07daec8e77fd0e55101bf42800c09a2b7a221e5f (diff)
remove accidentally commited duplicate capabilites handling code
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4837 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
-rw-r--r--lib/sbin/ConfigurationParser.pl28
1 files changed, 0 insertions, 28 deletions
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;
}