summaryrefslogtreecommitdiffstats
path: root/config-db
diff options
context:
space:
mode:
authorOliver Tappe2007-03-20 21:11:18 +0100
committerOliver Tappe2007-03-20 21:11:18 +0100
commit885dd5d9dbb53c5120d61600749740af3f506da6 (patch)
treee5e7b4231f08d46661036545711aef6baae9bbe2 /config-db
parent* removed slxsetup as it isn't required now that we have slxconfig (diff)
downloadcore-885dd5d9dbb53c5120d61600749740af3f506da6.tar.gz
core-885dd5d9dbb53c5120d61600749740af3f506da6.tar.xz
core-885dd5d9dbb53c5120d61600749740af3f506da6.zip
* did missing adjustments to recent refactoring step, as reported by Dirk
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@790 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db')
-rwxr-xr-xconfig-db/slxsettings13
1 files changed, 8 insertions, 5 deletions
diff --git a/config-db/slxsettings b/config-db/slxsettings
index ce8a9e38..0a8e8965 100755
--- a/config-db/slxsettings
+++ b/config-db/slxsettings
@@ -32,7 +32,7 @@ use lib "$FindBin::RealBin";
# development path to config-db stuff
use OpenSLX::Basics;
-use OpenSLX::ConfigDB qw(:access :manipulation);
+use OpenSLX::ConfigDB;
my (
$noShow,
@@ -68,8 +68,9 @@ if ($versionReq) {
openslxInit() or pod2usage(2);
# fetch slxconf entries...
-my $openslxDB = connectConfigDB();
-my $currSettings = fetchSettings($openslxDB);
+my $openslxDB = OpenSLX::ConfigDB->new();
+$openslxDB->connect();
+my $currSettings = $openslxDB->fetchSettings();
# ...and fetch current content of local settings file...
open(SETTINGS, "< $openslxConfig{'config-path'}/settings.local");
@@ -119,13 +120,13 @@ if ($changeCount) {
if (scalar(keys %cmdlineSettings) > 0) {
foreach my $key (keys %cmdlineSettings) {
if (exists $currSettings->{$key}) {
- changeSettings($openslxDB, { $key => $cmdlineSettings{$key} });
+ $openslxDB->changeSettings({ $key => $cmdlineSettings{$key} });
$changeCount++;
} else {
die _tr("unknown settings key <%s>!\n", $key);
}
}
- $currSettings = fetchSettings($openslxDB);
+ $currSettings = $openslxDB->fetchSettings();
}
if (!($noShow || $quiet)) {
@@ -140,6 +141,8 @@ if (!($noShow || $quiet)) {
}
}
+$openslxDB->disconnect();
+
__END__
=head1 NAME