Fixed fileset deletion dependency bug.

This commit is contained in:
Jamie Cameron
2009-11-28 21:35:29 -08:00
parent c0f86b2603
commit 39fd1aef76
2 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@ $parent = &get_director_config_parent();
foreach $d (@d) {
$fileset = &find_by("Name", $d, \@filesets);
if ($fileset) {
$child = &find_dependency("Client", $d, [ "Job", "JobDefs" ], $conf);
$child = &find_dependency("FileSet", $d, [ "Job", "JobDefs" ], $conf);
$child && &error(&text('fileset_echild', $child));
&save_directive($conf, $parent, $fileset, undef, 0);
}

View File

@ -20,8 +20,8 @@ else {
&lock_file($parent->{'file'});
if ($in{'delete'}) {
# Just delete this one
$name = &find_value("Name", $client->{'members'});
$child = &find_dependency("Client", $name, [ "Job", "JobDefs" ], $conf);
$name = &find_value("Name", $fileset->{'members'});
$child = &find_dependency("FileSet", $name, [ "Job", "JobDefs" ], $conf);
$child && &error(&text('fileset_echild', $child));
&save_directive($conf, $parent, $fileset, undef, 0);
}