summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Tappe2007-07-21 20:26:03 +0200
committerOliver Tappe2007-07-21 20:26:03 +0200
commit874547d3ff97851c9605a1caa243ce7a7c7025d6 (patch)
treec53bf7461284c65d18c1b4f3d6e3e11d2745a77d
parent* base work towards utf8-cleanness (it is now possible to handle vendor-OSes (diff)
downloadcore-874547d3ff97851c9605a1caa243ce7a7c7025d6.tar.gz
core-874547d3ff97851c9605a1caa243ce7a7c7025d6.tar.xz
core-874547d3ff97851c9605a1caa243ce7a7c7025d6.zip
* minor cleanup (two uninit values)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1267 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--installer/OpenSLX/OSSetup/Engine.pm3
-rw-r--r--lib/OpenSLX/Basics.pm5
2 files changed, 5 insertions, 3 deletions
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 233ba33c..e5b76f3d 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -506,7 +506,8 @@ sub addInstalledVendorOSToConfigDB
my $vendorOSName = $self->{'vendor-os-name'};
my $vendorOS = $openslxDB->fetchVendorOSByFilter({'name' => $vendorOSName});
if (defined $vendorOS) {
- if ($self->{'clone-source'} ne $vendorOS->{'clone_source'}) {
+ if ($vendorOS->{'clone_source'}
+ && $self->{'clone-source'} ne $vendorOS->{'clone_source'}) {
$openslxDB->changeVendorOS(
$vendorOS->{id},
{ 'clone_source' => $self->{'clone-source'} }
diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm
index dfcb27b1..4c3bf49c 100644
--- a/lib/OpenSLX/Basics.pm
+++ b/lib/OpenSLX/Basics.pm
@@ -211,8 +211,9 @@ sub openslxInit
);
}
if ($openslxConfig{'verbose-level'} >= 2) {
- foreach my $k (sort keys %openslxConfig) {
- vlog(2, "config-dump: $k = $openslxConfig{$k}");
+ foreach my $key (sort keys %openslxConfig) {
+ my $val = $openslxConfig{$key} || '';
+ vlog(2, "config-dump: $key = $val");
}
}