Tabs to spaces

diff --git a/Bucardo.pm b/Bucardo.pm
index 27a4658a71e6d862d7521e2f7b0fd85802c0a29f..9a8fdf11690d459ff94ce2bdb39a7005b18a2fb5 100644 (file)
--- a/Bucardo.pm
+++ b/Bucardo.pm
@@ -1043,7 +1043,7 @@ sub mcp_main {
             ## Request to pause a sync
             elsif ($name =~ /^pause_sync_(.+)/o) {
                 my $syncname = $1;
-                               my $msg;
+                my $msg;
 
                 ## We will not pause if this sync does not exist or it is inactive
                 if (! exists $self->{sync}{$syncname}) {
@@ -1053,13 +1053,13 @@ sub mcp_main {
                     $msg = qq{Cannot pause inactive sync "$syncname"};
                 }
                 else {
-                                       ## Mark it as paused, stop the kids and controller
+                    ## Mark it as paused, stop the kids and controller
                     $sync->{$syncname}{paused} = 1;
-                                       my $stopsync = "stopsync_$syncname";
-                                       $self->db_notify($maindbh, "kid_$stopsync");
-                                       $self->db_notify($maindbh, "ctl_$stopsync");
-                                       $maindbh->commit();
-                                       $self->glog(qq{Set sync "$syncname" as paused}, LOG_VERBOSE);
+                    my $stopsync = "stopsync_$syncname";
+                    $self->db_notify($maindbh, "kid_$stopsync");
+                    $self->db_notify($maindbh, "ctl_$stopsync");
+                    $maindbh->commit();
+                    $self->glog(qq{Set sync "$syncname" as paused}, LOG_VERBOSE);
                 }
                 if (defined $msg) {
                     $self->glog($msg, LOG_TERSE);
@@ -1068,7 +1068,7 @@ sub mcp_main {
             ## Request to resume a sync
             elsif ($name =~ /^resume_sync_(.+)/o) {
                 my $syncname = $1;
-                               my $msg;
+                my $msg;
 
                 ## We will not resume if this sync does not exist or it is inactive
                 if (! exists $self->{sync}{$syncname}) {
@@ -1078,9 +1078,9 @@ sub mcp_main {
                     $msg = qq{Cannot resume inactive sync "$syncname"};
                 }
                 else {
-                                       ## Mark it as resumed, stop the kids
+                    ## Mark it as resumed, stop the kids
                     $sync->{$syncname}{paused} = 0;
-                                       $self->glog(qq{Set sync "$syncname" as resumed}, LOG_VERBOSE);
+                    $self->glog(qq{Set sync "$syncname" as resumed}, LOG_VERBOSE);
                     ## MCP will restart the CTL on next loop around
                 }
                 if (defined $msg) {
@@ -1149,11 +1149,11 @@ sub mcp_main {
                 }
                 else {
 
-                                       ## reload overrides a pause
-                                       if ($sync->{$syncname}{paused}) {
-                                               $self->glog(qq{Resuming paused sync "$syncname"}, LOG_TERSE);
-                                               $sync->{$syncname}{paused} = 0;
-                                       }
+                    ## reload overrides a pause
+                    if ($sync->{$syncname}{paused}) {
+                        $self->glog(qq{Resuming paused sync "$syncname"}, LOG_TERSE);
+                        $sync->{$syncname}{paused} = 0;
+                    }
 
                     $self->glog(qq{Deactivating sync "$syncname"}, LOG_TERSE);
                     $self->deactivate_sync($sync->{$syncname});
@@ -1223,8 +1223,8 @@ sub mcp_main {
                 }
                 elsif ($self->activate_sync($sync->{$syncname})) {
                     $sync->{$syncname}{mcp_active} = 1;
-                                       ## Just in case:
-                                       $sync->{$syncname}{paused} = 0;
+                    ## Just in case:
+                    $sync->{$syncname}{paused} = 0;
                     $maindbh->do(
                         'UPDATE sync SET status = ? WHERE name = ?',
                         undef, 'active', $syncname
@@ -1293,10 +1293,10 @@ sub mcp_main {
             ## Skip if this sync has not been activated
             next if ! $s->{mcp_active};
 
-                       ## Skip if this one is paused
-                       next if $s->{paused};
+            ## Skip if this one is paused
+            next if $s->{paused};
 
-                       ## Skip is this one is stalled
+            ## Skip is this one is stalled
             next if $s->{status} eq 'stalled';
 
             ## If this is not a stayalive, AND is not being kicked, skip it

diff --git a/Makefile.PL b/Makefile.PL
index 681fe5136276067d3febdffac6ca2ce220a80271..3ce8776febfc4b3653bd922d9b77fafbbf8700f3 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -25,9 +25,9 @@ WriteMakefile(
                      'Pod::Usage'          => '0',
                      'Sys::Hostname'       => '1.11',
                      'Sys::Syslog'         => '0.13',
-                                        'File::Spec'          => '0',
-                                        'MIME::Base64'        => '0',
-                                        'boolean'             => '0',
+                     'File::Spec'          => '0',
+                     'MIME::Base64'        => '0',
+                     'boolean'             => '0',
                  },
     NO_META      => 1,
     NEEDS_LINKING => 0,
@@ -40,47 +40,47 @@ WriteMakefile(
 package MY;
 
 sub clean {
-       my $string = shift->SUPER::clean(@_);
-       $string =~ s{\t}{\tperl t/98-cleanup\.t\n\t};
-       $string .= qq{\n\nhtml : \n\t};
+    my $string = shift->SUPER::clean(@_);
+    $string =~ s{\t}{\tperl t/98-cleanup\.t\n\t};
+    $string .= qq{\n\nhtml : \n\t};
     $string .= qq{\t\$(NOECHO) pod2html Bucardo.pm > Bucardo.pm.html\n};
     $string .= qq{\t\$(NOECHO) pod2html bucardo > bucardo.html\n};
     $string .= qq{\t\$(NOECHO) \$(RM_F) pod*.tmp pm_to_blib\n};
     $string .= qq{\t\$(NOECHO) \$(PERL) -pi -e "s/<link.*?>//" Bucardo.pm.html bucardo.html\n};
     $string .= qq{\t\$(NOECHO) \$(PERL) -pi -e "s~\\`\\`(.+?)''~&quot;\\1&quot;~g" Bucardo.pm.html bucardo.html\n};
     $string .= qq{\t\$(NOECHO) \$(ECHO) Created Bucardo.pm.html and bucardo.html\n};
-       return $string;
+    return $string;
 }
 
 sub blibdirs {
-       my $string = shift->SUPER::blibdirs_target(@_);
-       $string = qq{INST_SHARE = blib/share\n\n$string};
-       $string =~ s{(blibdirs : .+)}{$1 \$(INST_SHARE)\$(DFSEP).exists};
-       $string .= qq{\$(INST_SHARE)\$(DFSEP).exists :: Makefile.PL\n};
-       $string .= qq{\t\$(NOECHO) \$(MKPATH) \$(INST_SHARE)\n};
-       $string .= qq{\t\$(NOECHO) \$(CHMOD) 755 \$(INST_SHARE)\n};
-       $string .= qq{\t\$(NOECHO) \$(TOUCH) \$(INST_SHARE)\$(DFSEP).exists\n};
-       $string .= qq{\t\$(CP) bucardo.schema \$(INST_SHARE)/bucardo.schema\n};
-       $string .= qq{\t-\$(NOECHO) \$(CHMOD) \$(PERM_RW) \$(INST_SHARE)/bucardo.schema\n};
-       return $string;
+    my $string = shift->SUPER::blibdirs_target(@_);
+    $string = qq{INST_SHARE = blib/share\n\n$string};
+    $string =~ s{(blibdirs : .+)}{$1 \$(INST_SHARE)\$(DFSEP).exists};
+    $string .= qq{\$(INST_SHARE)\$(DFSEP).exists :: Makefile.PL\n};
+    $string .= qq{\t\$(NOECHO) \$(MKPATH) \$(INST_SHARE)\n};
+    $string .= qq{\t\$(NOECHO) \$(CHMOD) 755 \$(INST_SHARE)\n};
+    $string .= qq{\t\$(NOECHO) \$(TOUCH) \$(INST_SHARE)\$(DFSEP).exists\n};
+    $string .= qq{\t\$(CP) bucardo.schema \$(INST_SHARE)/bucardo.schema\n};
+    $string .= qq{\t-\$(NOECHO) \$(CHMOD) \$(PERM_RW) \$(INST_SHARE)/bucardo.schema\n};
+    return $string;
 }
 
 sub install {
-       my $string = shift->SUPER::install(@_);
-       my $vars = qq{DESTINSTALLSHARE = \$(INSTALL_BASE)/usr/local/share/bucardo\n};
-       $vars .= qq{DESTINSTALLSITESHARE = \$(INSTALL_BASE)/usr/local/share/bucardo\n};
-       $vars .= qq{DESTINSTALLVENDORSHARE = \$(INSTALL_BASE)/usr/share/bucardo\n};
+    my $string = shift->SUPER::install(@_);
+    my $vars = qq{DESTINSTALLSHARE = \$(INSTALL_BASE)/usr/local/share/bucardo\n};
+    $vars .= qq{DESTINSTALLSITESHARE = \$(INSTALL_BASE)/usr/local/share/bucardo\n};
+    $vars .= qq{DESTINSTALLVENDORSHARE = \$(INSTALL_BASE)/usr/share/bucardo\n};
 
-       if ($ENV{INSTALL_BUCARDODIR}) {
-               for my $dir (qw{SCRIPT LIB MAN1DIR MAN3DIR}) {
-                       $vars .= qq{INSTALLSITE$dir=$ENV{INSTALL_BUCARDODIR}\n};
-               }
-               for my $dir (qw{SITEARCH ARCHLIB SITESHARE}) {
-                       $vars .= qq{DESTINSTALL$dir=$ENV{INSTALL_BUCARDODIR}\n};
-               }
-       }
+    if ($ENV{INSTALL_BUCARDODIR}) {
+        for my $dir (qw{SCRIPT LIB MAN1DIR MAN3DIR}) {
+            $vars .= qq{INSTALLSITE$dir=$ENV{INSTALL_BUCARDODIR}\n};
+        }
+        for my $dir (qw{SITEARCH ARCHLIB SITESHARE}) {
+            $vars .= qq{DESTINSTALL$dir=$ENV{INSTALL_BUCARDODIR}\n};
+        }
+    }
 
-       $string = "\n$vars\n$string";
-       $string =~ s{(\t\$\(INST_BIN\) \$\((DESTINSTALL.*?)BIN.+)}{$1\n\t\t\$(INST_SHARE) \$($2SHARE) \\}g;
-       return $string;
+    $string = "\n$vars\n$string";
+    $string =~ s{(\t\$\(INST_BIN\) \$\((DESTINSTALL.*?)BIN.+)}{$1\n\t\t\$(INST_SHARE) \$($2SHARE) \\}g;
+    return $string;
 }