WebSVN – DevTools – Diff – /dpkg_blat/trunk/src/blat/blatDaemon.pl



    #
    if ( $conf->{'allProjects'} )
    {
        $m_sqlstr = "SELECT rt.RTAG_ID" .
                    " FROM RELEASE_MANAGER.RELEASE_TAGS rt" .
                    " WHERE rt.OFFICIAL != 'A'". 
                    "   AND rt.OFFICIAL != 'S'";
                    #" AND rt.OFFICIAL != 'Y'";
    }
    else
    {
        #

            #   Build up an sql query
            #
            my $m_plist = join ',', @projectList;
            $m_sqlstr = "SELECT rt.RTAG_ID" .
                        " FROM RELEASE_MANAGER.RELEASE_TAGS rt" .
                        " WHERE ( PROJ_ID in ( $m_plist) )" .
                        "   AND rt.OFFICIAL != 'A'" .
                        "   AND rt.OFFICIAL != 'S'";
                        #" AND rt.OFFICIAL != 'Y'";
        }
    }
 
    if ( defined $m_sqlstr )

 
        #
        #   Process the packages located in the tags area
        #   Have attempted to keep them in creation order
        #
        my $notSent = 0;
        send_tags:
        foreach my $entry ( @tagPkgList )
        {
            my ($package, $version, $file) = split ($;, $entry);
            if ( --$txcount <= 0 )

            if ($txDone ) {
                unlink $file;
            }
            else
            {
                $notSent++;
                if ($conf->{'tagage'} > 0) {
                    my ($mtime) = Utils::mtime( $file );
                    if ( $now - $mtime > $conf->{'tagage'} )
                    {
                        $logger->warn ("Delete unsatisfied tag: $package::$version after $conf->{'tagage'}" );

            Utils::resetWedge();
        }
 
        # Nice output
        if ($showSend) {
            $logger->warn("Max tag transfer count exceeded: $notSent transfer remaining");
            $logger->warn("Max tag transfer count exceeded: $delCount deletion remaining");
        }
        elsif ($showDel) {
            $logger->warn("Max tag transfer count exceeded: $delCount deletion remaining");
        }

    {
        while (my $tag = readdir($dh) )
        {
            next if ( $tag =~ m~^\.~ );
            my $file = "$conf->{'tagdir'}/$tag";
#            $logger->verbose3("calcZipRequests: $file");
 
            next unless ( -f $file );
            next if ( $tag  eq 'ReleaseList' );
            next if ( $tag =~ m~^DEL(.)::~);
 

Rev 7469	Rev 7539
Line 1428...	Line 1428...
1428	`#`	1428	`#`
1429	`if ( $conf->{'allProjects'} )`	1429	`if ( $conf->{'allProjects'} )`
1430	`{`	1430	`{`
1431	`$m_sqlstr = "SELECT rt.RTAG_ID" .`	1431	`$m_sqlstr = "SELECT rt.RTAG_ID" .`
1432	`" FROM RELEASE_MANAGER.RELEASE_TAGS rt" .`	1432	`" FROM RELEASE_MANAGER.RELEASE_TAGS rt" .`
1433	`" WHERE rt.OFFICIAL != 'A'";`	1433	`" WHERE rt.OFFICIAL != 'A'".`
-		1434	`" AND rt.OFFICIAL != 'S'";`
1434	`#" AND rt.OFFICIAL != 'Y'";`	1435	`#" AND rt.OFFICIAL != 'Y'";`
1435	`}`	1436	`}`
1436	`else`	1437	`else`
1437	`{`	1438	`{`
1438	`#`	1439	`#`
Line 1445...	Line 1446...
1445	`# Build up an sql query`	1446	`# Build up an sql query`
1446	`#`	1447	`#`
1447	`my $m_plist = join ',', @projectList;`	1448	`my $m_plist = join ',', @projectList;`
1448	`$m_sqlstr = "SELECT rt.RTAG_ID" .`	1449	`$m_sqlstr = "SELECT rt.RTAG_ID" .`
1449	`" FROM RELEASE_MANAGER.RELEASE_TAGS rt" .`	1450	`" FROM RELEASE_MANAGER.RELEASE_TAGS rt" .`
1450	`" WHERE ( PROJ_ID in ( $m_plist) ) AND rt.OFFICIAL != 'A'";`	1451	`" WHERE ( PROJ_ID in ( $m_plist) )" .`
-		1452	`" AND rt.OFFICIAL != 'A'" .`
-		1453	`" AND rt.OFFICIAL != 'S'";`
1451	`#" AND rt.OFFICIAL != 'Y'";`	1454	`#" AND rt.OFFICIAL != 'Y'";`
1452	`}`	1455	`}`
1453	`}`	1456	`}`
1454		1457
1455	`if ( defined $m_sqlstr )`	1458	`if ( defined $m_sqlstr )`
Line 1809...	Line 1812...
1809		1812
1810	`#`	1813	`#`
1811	`# Process the packages located in the tags area`	1814	`# Process the packages located in the tags area`
1812	`# Have attempted to keep them in creation order`	1815	`# Have attempted to keep them in creation order`
1813	`#`	1816	`#`
-		1817	`my $notSent = 0;`
1814	`send_tags:`	1818	`send_tags:`
1815	`foreach my $entry ( @tagPkgList )`	1819	`foreach my $entry ( @tagPkgList )`
1816	`{`	1820	`{`
1817	`my ($package, $version, $file) = split ($;, $entry);`	1821	`my ($package, $version, $file) = split ($;, $entry);`
1818	`if ( --$txcount <= 0 )`	1822	`if ( --$txcount <= 0 )`
Line 1844...	Line 1848...
1844	`if ($txDone ) {`	1848	`if ($txDone ) {`
1845	`unlink $file;`	1849	`unlink $file;`
1846	`}`	1850	`}`
1847	`else`	1851	`else`
1848	`{`	1852	`{`
-		1853	`$notSent++;`
1849	`if ($conf->{'tagage'} > 0) {`	1854	`if ($conf->{'tagage'} > 0) {`
1850	`my ($mtime) = Utils::mtime( $file );`	1855	`my ($mtime) = Utils::mtime( $file );`
1851	`if ( $now - $mtime > $conf->{'tagage'} )`	1856	`if ( $now - $mtime > $conf->{'tagage'} )`
1852	`{`	1857	`{`
1853	`$logger->warn ("Delete unsatisfied tag: $package::$version after $conf->{'tagage'}" );`	1858	`$logger->warn ("Delete unsatisfied tag: $package::$version after $conf->{'tagage'}" );`
Line 1862...	Line 1867...
1862	`Utils::resetWedge();`	1867	`Utils::resetWedge();`
1863	`}`	1868	`}`
1864		1869
1865	`# Nice output`	1870	`# Nice output`
1866	`if ($showSend) {`	1871	`if ($showSend) {`
1867	`$logger->warn("Max tag transfer count exceeded: $tagCount transfer remaining");`	1872	`$logger->warn("Max tag transfer count exceeded: $notSent transfer remaining");`
1868	`$logger->warn("Max tag transfer count exceeded: $delCount deletion remaining");`	1873	`$logger->warn("Max tag transfer count exceeded: $delCount deletion remaining");`
1869	`}`	1874	`}`
1870	`elsif ($showDel) {`	1875	`elsif ($showDel) {`
1871	`$logger->warn("Max tag transfer count exceeded: $delCount deletion remaining");`	1876	`$logger->warn("Max tag transfer count exceeded: $delCount deletion remaining");`
1872	`}`	1877	`}`
Line 1957...	Line 1962...
1957	`{`	1962	`{`
1958	`while (my $tag = readdir($dh) )`	1963	`while (my $tag = readdir($dh) )`
1959	`{`	1964	`{`
1960	`next if ( $tag =~ m~^\.~ );`	1965	`next if ( $tag =~ m~^\.~ );`
1961	`my $file = "$conf->{'tagdir'}/$tag";`	1966	`my $file = "$conf->{'tagdir'}/$tag";`
1962	`$logger->verbose3("calcZipRequests: $file");`	1967	`# $logger->verbose3("calcZipRequests: $file");`
1963		1968
1964	`next unless ( -f $file );`	1969	`next unless ( -f $file );`
1965	`next if ( $tag eq 'ReleaseList' );`	1970	`next if ( $tag eq 'ReleaseList' );`
1966	`next if ( $tag =~ m~^DEL(.)::~);`	1971	`next if ( $tag =~ m~^DEL(.)::~);`
1967		1972

Subversion Repositories DevTools

(root)/dpkg_blat/trunk/src/blat/blatDaemon.pl – Rev 7469 → 7539