Subversion Repositories DevTools

Rev

Rev 1048 | Rev 1289 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1048 Rev 1050
Line 119... Line 119...
119
        maintainTagList();
119
        maintainTagList();
120
    }
120
    }
121
    %releaseData = ();
121
    %releaseData = ();
122
 
122
 
123
    sleep( $conf->{'sleep'} );
123
    sleep( $conf->{'sleep'} );
-
 
124
 
-
 
125
    #
124
    waitpid(-1, WNOHANG);                           # Reap dead children
126
    #   Reap any and all dead children
-
 
127
    #
-
 
128
    my $kid;
-
 
129
    do {
-
 
130
        $kid = waitpid(-1, WNOHANG);
-
 
131
    } while ( $kid > 0 );
125
}
132
}
126
$logger->logmsg("Child End");
133
$logger->logmsg("Child End");
127
exit 0;
134
exit 0;
128
 
135
 
129
#-------------------------------------------------------------------------------
136
#-------------------------------------------------------------------------------
Line 183... Line 190...
183
 
190
 
184
        $logger->warn("Transfer session configured as not active")
191
        $logger->warn("Transfer session configured as not active")
185
            unless ( $conf->{'active'} );
192
            unless ( $conf->{'active'} );
186
 
193
 
187
        $logger->warn("Transfer all projects packages")
194
        $logger->warn("Transfer all projects packages")
188
            unless ( $conf->{'allProjects'} );
195
            if ( $conf->{'allProjects'} );
189
 
196
 
190
        #
197
        #
191
        #   When config is read force some actions
198
        #   When config is read force some actions
192
        #       - Force tagList to be created
199
        #       - Force tagList to be created
-
 
200
        #       - Force release scan
193
        $lastTagListScan = 0;
201
        $lastTagListScan = 0;
-
 
202
        $lastReleaseScan = 0;
-
 
203
        
194
    }
204
    }
195
}
205
}
196
 
206
 
197
 
207
 
198
#-------------------------------------------------------------------------------
208
#-------------------------------------------------------------------------------
Line 399... Line 409...
399
 
409
 
400
                    $excessPkgList->{$pname}{$pver} = $pdata;
410
                    $excessPkgList->{$pname}{$pver} = $pdata;
401
                    $excessPkgListCount++;
411
                    $excessPkgListCount++;
402
                    $logger->verbose("Excess package: ${pname}/${pver}");
412
                    $logger->verbose("Excess package: ${pname}/${pver}");
403
                }
413
                }
-
 
414
#                else
-
 
415
#                {
-
 
416
#                        $logger->verbose3("Retain package: ${pname}/${pver}");
-
 
417
#                }
404
            }
418
            }
405
        }
419
        }
406
    }
420
    }
407
 
421
 
408
    #
422
    #
Line 529... Line 543...
529
    {
543
    {
530
        while ( (my ($pver, $pdata) ) = each %{$pvers} )
544
        while ( (my ($pver, $pdata) ) = each %{$pvers} )
531
        {
545
        {
532
            if ( --$txcount <= 0 )
546
            if ( --$txcount <= 0 )
533
            {
547
            {
534
                $logger->warn("Max transfer count exceeded: $needPkgListCount remaining");
548
                $logger->warn("Max transfer count exceeded: $needPkgListCount transfer remaining");
535
                $lastReleaseScan = 0;
549
                $lastReleaseScan = 0;
536
                last send_pkgs;
550
                last send_pkgs;
537
            }
551
            }
538
            transferPackage ($pname, $pver, $pdata);
552
            transferPackage ($pname, $pver, $pdata);
539
            $needPkgListCount--;
553
            $needPkgListCount--;
Line 548... Line 562...
548
    {
562
    {
549
        while ( (my ($pver, $pdata) ) = each %{$pvers} )
563
        while ( (my ($pver, $pdata) ) = each %{$pvers} )
550
        {
564
        {
551
            if ( --$txcount <= 0 )
565
            if ( --$txcount <= 0 )
552
            {
566
            {
553
                $logger->warn("Max transfer count exceeded: $excessPkgListCount remaining");
567
                $logger->warn("Max transfer count exceeded: $excessPkgListCount deletion remaining");
554
                $lastReleaseScan = 0;
568
                $lastReleaseScan = 0;
555
                last delete_pkgs;
569
                last delete_pkgs;
556
            }
570
            }
557
            deletePackage ($pname, $pver, $pdata);
571
            deletePackage ($pname, $pver, $pdata);
558
            $excessPkgListCount--;
572
            $excessPkgListCount--;
Line 677... Line 691...
677
    }
691
    }
678
    else
692
    else
679
    {
693
    {
680
        $logger->warn("getPkgList: SQL Prepare failure");
694
        $logger->warn("getPkgList: SQL Prepare failure");
681
    }
695
    }
-
 
696
 
-
 
697
   disconnectRM(\$RM_DB);
682
   return \%pdata;
698
   return \%pdata;
683
}
699
}
684
 
700
 
685
 
701
 
686
#-------------------------------------------------------------------------------
702
#-------------------------------------------------------------------------------
Line 717... Line 733...
717
    #
733
    #
718
    if ( $conf->{'allProjects'} )
734
    if ( $conf->{'allProjects'} )
719
    {
735
    {
720
        $m_sqlstr = "SELECT rt.RTAG_ID" .
736
        $m_sqlstr = "SELECT rt.RTAG_ID" .
721
                    " FROM RELEASE_MANAGER.RELEASE_TAGS rt" .
737
                    " FROM RELEASE_MANAGER.RELEASE_TAGS rt" .
722
                    " WHERE rt.OFFICIAL != 'A' AND rt.OFFICIAL != 'Y'";
738
                    " WHERE rt.OFFICIAL != 'A'";
-
 
739
                    #" AND rt.OFFICIAL != 'Y'";
723
    }
740
    }
724
    else
741
    else
725
    {
742
    {
726
        #
743
        #
727
        #   Convert list of projects into a list of releases
744
        #   Convert list of projects into a list of releases
Line 764... Line 781...
764
        }
781
        }
765
        else
782
        else
766
        {
783
        {
767
            $logger->warn("getReleaseList: SQL Prepare failure");
784
            $logger->warn("getReleaseList: SQL Prepare failure");
768
        }
785
        }
-
 
786
        disconnectRM(\$RM_DB);
769
    }
787
    }
770
 
788
 
771
    #
789
    #
772
    #   Add in the user specified list of releases
790
    #   Add in the user specified list of releases
773
    #
791
    #