Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49586 - /trunk/ldap-server/src/LdapServer.pm
  • From: rhafer@xxxxxxxxxxxxxxxx
  • Date: Fri, 01 Aug 2008 14:29:14 -0000
  • Message-id: <20080801142914.A755E27333@xxxxxxxxxxxxxxxx>
Author: rhafer
Date: Fri Aug 1 16:29:14 2008
New Revision: 49586

URL: http://svn.opensuse.org/viewcvs/yast?rev=49586&view=rev
Log:
Don't crash when overwriting existing configuration

Modified:
trunk/ldap-server/src/LdapServer.pm

Modified: trunk/ldap-server/src/LdapServer.pm
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=49586&r1=49585&r2=49586&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapServer.pm (original)
+++ trunk/ldap-server/src/LdapServer.pm Fri Aug 1 16:29:14 2008
@@ -34,6 +34,7 @@
my $configured = 0;
my $usesBackConfig = 0;
my $slapdConfChanged = 0;
+my $overwriteConfig = 0;
my $serviceEnabled = 0;
my $serviceRunning = 1;
my $registerSlp = 0;
@@ -377,8 +378,9 @@
my $self = shift;
y2milestone("LdapServer::Write");
my $ret = 1;
- if ( ! $usesBackConfig || ! $slapdConfChanged )
+ if ( ! $usesBackConfig || ! $slapdConfChanged || $overwriteConfig )
{
+ $overwriteConfig = 0;
my $progressItems = [ _("Writing Startup Configuration"),
_("Cleaning up config directory"),
_("Creating Configuration"),
@@ -606,6 +608,7 @@
{
return YaST::YCP::Boolean($usingDefaults);
}
+
##
# Return packages needed to be installed and removed during
# Autoinstallation to insure module has all needed software
@@ -887,7 +890,8 @@
$self->InitDbDefaults();
}
y2milestone(Data::Dumper->Dump([\%dbDefaults]));
- $usingDefaults = 1;
+ $usingDefaults = 1;
+ $overwriteConfig = 1;
return \%dbDefaults;
}


--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages