* added more precise errors for inconsistent DB states (if the export or vendor-OS a

  system refers to doesn't exist)
* some cleanup


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@866 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 10 insertions, 2 deletions

diff --git a/config-db/OpenSLX/ConfigDB.pm b/config-db/OpenSLX/ConfigDB.pm
index e619c660..efe15078 100644
--- a/config-db/OpenSLX/ConfigDB.pm
+++ b/config-db/OpenSLX/ConfigDB.pm
@@ -863,9 +863,15 @@ sub aggregatedSystemFileInfoFor
 	my $system = shift;
 
 	my $export = $self->fetchExportByID($system->{export_id});
-	return () if !$export || !length($export->{name});
+	if (!defined $export) {
+		die _tr("DB-problem: system '%s' references export with id=%s, but that doesn't exist!",
+				$system->{name}, $system->{export_id});
+	}
 	my $vendorOS = $self->fetchVendorOSByID($export->{vendor_os_id});
-	return () if !$vendorOS || !length($vendorOS->{name});
+	if (!defined $vendorOS) {
+		die _tr("DB-problem: export '%s' references vendor-OS with id=%s, but that doesn't exist!",
+				$export->{name}, $export->{vendor_os_id});
+	}
 	my $kernelPath
 		= "$openslxConfig{'private-path'}/stage1/$vendorOS->{name}/boot";
 
@@ -881,6 +887,8 @@ sub aggregatedSystemFileInfoFor
 	my $info = { %$system };
 	$info->{'kernel-file'} = "$kernelPath/$system->{kernel}";
 	$info->{'export-uri'} = $exportURI;
+	$info->{'export'} = $export;
+	$info->{'vendor-os'} = $vendorOS;
 	return $info;
 }