Subversion Repositories DevTools

Rev

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

Rev 7389 Rev 7394
Line 330... Line 330...
330 
                    last send_tags;
 330 
                    last send_tags;
331 
                }
 331 
                }
332 
 
 332 
 
333 
                #
 333 
                #
334 
                #
 334 
                #
- 
 
 335 
                if ( ! zipRequestNeeded($package, $version) ) {
- 
 
 336 
                    $logger->verbose2("NoZip request outstanding: $package, $version");
- 
 
 337 
                    unlink $file;
- 
 
 338 
 
335 
                if ( tarZipPackage( $package, $version )) {
 339 
                } elsif ( tarZipPackage( $package, $version )) {
336 
                    unlink $file;
 340 
                    unlink $file;
337 
                    triggerTransfers($package, $version);
 341 
                    triggerTransfers($package, $version);
338 
                }
 342 
                }
339 
                else
 343 
                else
340 
                {
 344 
                {
Line 355... Line 359...
355 
        }
 359 
        }
356 
    }
 360 
    }
357 
}
 361 
}
358 
 
 362 
 
359 
#-------------------------------------------------------------------------------
 363 
#-------------------------------------------------------------------------------
- 
 
 364 
# Function        : zipRequestNeeded
- 
 
 365 
#
- 
 
 366 
# Description     : Scan tags and ensure that the zip request is still needed
- 
 
 367 
#                   Another task must still have need for this package to be
- 
 
 368 
#                   tarZipped
- 
 
 369 
#
- 
 
 370 
# Inputs          : $pname
- 
 
 371 
#                   $version
- 
 
 372 
#
- 
 
 373 
# Returns         : True if still needed
- 
 
 374 
#
- 
 
 375 
sub zipRequestNeeded {
- 
 
 376 
    my ($pname, $version) = @_;
- 
 
 377 
 
- 
 
 378 
    #
- 
 
 379 
    #   Find the tag in all blat transfer areas
- 
 
 380 
    #
- 
 
 381 
    my $tag = "$pname::$version";
- 
 
 382 
    my @tagList = glob ("$tagRoot/*/$tag");
- 
 
 383 
 
- 
 
 384 
    #
- 
 
 385 
    #   Expect to find my own tag, so a count of 1 indicates not found elsewhere
- 
 
 386 
    #
- 
 
 387 
    my $count = scalar @tagList;
- 
 
 388 
    return $count > 1;
- 
 
 389 
}
- 
 
 390 
 
- 
 
 391 
 
- 
 
 392 
#-------------------------------------------------------------------------------
360 
# Function        : cleanZipStore
393 
# Function        : cleanZipStore
361 
#
 394 
#
362 
# Description     : Cleanup the store of zipped packages
 395 
# Description     : Cleanup the store of zipped packages
363 
#                   If a tarZip is no longer needed for a transfer, then we can consider
 396 
#                   If a tarZip is no longer needed for a transfer, then we can consider
364 
#                   removing it from the store
 397 
#                   removing it from the store