Attachment 159552 Details for Bug 248145 – diffs to fix exit code

[patch] diffs to fix exit code

cvsdiffs (text/plain), 4.95 KB, created by Rich Megginson on 2007-07-18 19:45:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-07-18 19:45:18 UTC

Size: 4.95 KB

patch

obsolete

>Index: adminserver/admserv/newinst/src/migrate-ds-admin.pl.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
>retrieving revision 1.4
>diff -u -8 -r1.4 migrate-ds-admin.pl.in
>--- adminserver/admserv/newinst/src/migrate-ds-admin.pl.in	13 Jul 2007 18:39:15 -0000	1.4
>+++ adminserver/admserv/newinst/src/migrate-ds-admin.pl.in	18 Jul 2007 19:44:36 -0000
>@@ -55,56 +55,56 @@
>                        "@propertydir@/setup-ds.res");
> 
> my $mig = new Migration($res); # parse cmd line etc.
> 
> $mig->msg('begin_dsadmin_migration', $mig->{oldsroot});
> 
> if (!$mig->{inf}->{General}->{ConfigDirectoryAdminPwd}) {
>     $mig->msg('error_configds_adminpwd_required');
>-    exit 1;
>+    $mig->doExit(1);
> }
> 
> # first, migrate directory server instances
> # either the config ds will be one of them, or we
> # should have already migrated the config DS
> $mig->msg('begin_ds_migration', $mig->{oldsroot});
> if (!migrateDS($mig)) {
>-    exit 1;
>+    $mig->doExit(1);
> }
> 
> # if the config ds is on the local machine, shut down the old one
> # and bring up the new one - the rest of migration needs to update it
> 
> my $configdsinst = getLocalConfigDS("$mig->{oldsroot}/admin-serv/config");
> if ($configdsinst) {
>     system("$mig->{oldsroot}/slapd-$configdsinst/stop-slapd");
>     system("@dslibdir@/slapd-$configdsinst/start-slapd");
> }
> 
> # next, migrate the admin server - this also registers the directory servers
> $mig->msg('begin_as_migration', $mig->{oldsroot});
> if (!migrateAdminServer($mig)) {
>-    exit 1;
>+    $mig->doExit(1);
> }
> 
> # next, register/update the new directory servers
> # in the config ds
> $mig->msg('registering_dirserver_instances');
> my @errs;
> if (!registerManyDSWithConfigDS($mig->{inf}, \@errs,
>                                 $mig->{configdir},
>                                 @{$mig->{instances}})) {
>     $mig->msg($FATAL, @errs);
>-    exit 1;
>+    $mig->doExit(1);
> }
> 
> $mig->msg('end_dsadmin_migration');
> 
>+$mig->doExit(0);
>+
> END {
>     if ($mig) {
>         if (!$mig->{keep}) {
>             unlink $mig->{inffile};
>         }
>-
>-        $mig->doExit();
>     }
> }
>Index: adminserver/admserv/newinst/src/setup-ds-admin.pl.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
>retrieving revision 1.8
>diff -u -8 -r1.8 setup-ds-admin.pl.in
>--- adminserver/admserv/newinst/src/setup-ds-admin.pl.in	13 Jul 2007 18:39:15 -0000	1.8
>+++ adminserver/admserv/newinst/src/setup-ds-admin.pl.in	18 Jul 2007 19:44:36 -0000
>@@ -118,17 +118,17 @@
>         ['dialog_readytoproceed_prompt'],
>     );
>     push @dialogs, $readytoproceed;
> 
>     $dialogmgr->addDialog(@dialogs);
> 
>     my $rc = $dialogmgr->run();
>     if ($rc) {
>-        $setup->doExit();
>+        $setup->doExit($rc);
>     }
> }
> 
> my $createconfigds;
> if ((defined($setup->{inf}->{slapd}->{SlapdConfigForMC}) and
>      ("yes" =~ /^$setup->{inf}->{slapd}->{SlapdConfigForMC}/i)) or
>     (defined($setup->{inf}->{slapd}->{UseExistingMC}) and
>      !$setup->{inf}->{slapd}->{UseExistingMC})) {
>@@ -145,66 +145,64 @@
> 
> $setup->msg('create_dirserver');
> 
> # create a directory server instance
> my @errs = createDSInstance($setup->{inf});
> if (@errs) {
>     $setup->msg(@errs);
>     $setup->msg($FATAL, 'error_creating_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier});
>-    exit 1;
>+    $setup->doExit(1);
> } else {
>     $setup->msg('created_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier});
> }
> 
> # setup directory server instance to be the configuration DS
> if ($createconfigds) {
>     $setup->msg('create_configds');
>     if (!createConfigDS($setup->{inf}, \@errs)) {
>         $setup->msg($FATAL, @errs);
>         $setup->msg($FATAL, 'error_create_configds');
>-        exit 1;
>+        $setup->doExit(1);
>     }
> }
> else
> {
>     $setup->msg('create_configds');
>     if (!createSubDS($setup->{inf}, \@errs)) {
>         $setup->msg($FATAL, @errs);
>         $setup->msg($FATAL, 'error_create_configds');
>-        exit 1;
>+        $setup->doExit(1);
>     }
> }
> 
> # register ds instances with config DS
> if (!registerDSWithConfigDS($setup->{inf}->{slapd}->{ServerIdentifier},
>                             \@errs,
>                             $setup->{inf})) {
>     $setup->msg(@errs);
>     $setup->msg($FATAL, 'error_register_dirserver');
>-    exit 1;
>+    $setup->doExit(1);
> }
> 
> 
> # configure and register the admin server instance
> if (!$setup->{reconfigas}) {
>     if (!createAdminServer($setup)) {
>         $setup->msg($FATAL, 'error_create_adminserver');
>-        exit 1;
>+        $setup->doExit(1);
>     }
> } else {
>     if (!reconfigAdminServer($setup)) {
>         $setup->msg($FATAL, 'error_reconfig_adminserver');
>-        exit 1;
>+        $setup->doExit(1);
>     }
> }
> 
>-$setup->msg($SUCCESS, 'setup_complete');
>+$setup->doExit(0);
> 
> END {
>     if ($setup) {
>         if (!$setup->{keep}) {
>             unlink $setup->{inffile};
>         }
>-
>-        $setup->doExit();
>     }
> }

Actions: View | Diff

Attachments on bug 248145: 159175 | 159176 | 159177 | 159178 | 159179 | 159181 | 159182 | 159183 | 159184 | 159185 | 159186 | 159187 | 159188 | 159227 | 159228 | 159230 | 159234 | 159235 | 159550 | 159551 | 159552 | 159558