Subversion Repositories DevTools

Rev

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

Rev 5609 Rev 6104
Line 75... Line 75...
75 
our %Packages;
 75 
our %Packages;
76 
 
 76 
 
77 
#
 77 
#
78 
# Default config information
 78 
# Default config information
79 
# May be replaced by xxx.cnf file
 79 
# May be replaced by xxx.cnf file
- 
 
 80 
#   qdirAge = 0 => No local quarantine
80 
#
 81 
#
81 
my %config = (
 82 
my %config = (
82 
    'retain'        => '31',
 83 
    'retain'        => '31',
83 
    'qdirAge'       => '90',
 84 
    'qdirAge'       => '90',
84 
    'retainNoRm'    => '31',
 85 
    'retainNoRm'    => '31',
Line 1310... Line 1311...
1310 
                Log (sprintf("S3Quarantined:%s%s,%4.4s,%s%s", $testMsg, $entry->{reason}, $entry->{age}, $path, $s3msg));
 1311 
                Log (sprintf("S3Quarantined:%s%s,%4.4s,%s%s", $testMsg, $entry->{reason}, $entry->{age}, $path, $s3msg));
1311 
            }
 1312 
            }
1312 
 
 1313 
 
1313 
            unless ($s3error)
 1314 
            unless ($s3error)
1314 
            {
 1315 
            {
1315 
                #
 - 
 
1316 
                #   Transfer then delete to local directory
 - 
 
1317 
                #
 - 
 
1318 
                unless (-d $tdir)
 - 
 
1319 
                {
 - 
 
1320 
                    eval { mkpath($tdir) };
 - 
 
1321 
                    ReportError ("Did not create quarantine target: $tdir")
 - 
 
1322 
                        unless (-d $tdir);
 - 
 
1323 
                }
 - 
 
1324 
 
 - 
 
1325 
                if (-d $tdir)
 1316 
                if ($config{qdirAge} <= 0)
1326 
                {
 1317 
                {
- 
 
 1318 
                    #
1327 
                    $rv = system ('mv', '-n', $path, $tdir);
 1319 
                    #   Just delete the package-version
- 
 
 1320 
                    #
- 
 
 1321 
                    rmtree( $path);
1328 
                    if ( $rv )
 1322 
                    if (-d $path)
1329 
                    {
 1323 
                    {
1330 
                        ReportError ("Move $path to $tdir");
 1324 
                        ReportError ("Deleting $path ");
1331 
                        $statistics{'QuarantineError'}++;
 1325 
                        $statistics{'QuarantineError'}++;
1332 
 
 - 
 
1333 
                        #
 - 
 
1334 
                        # Clean up what may have been moved
 - 
 
1335 
                        # NOTE: deleted so that we don't loose stuff if it gets ugly
 - 
 
1336 
        #                rmtree( $tpath);
 - 
 
1337 
        #                rmdir ($tdir);
 1326 
                        $emsg = ' - Delete error';
1338 
                    }
 1327 
                    }
1339 
                    else
 1328 
                    else
1340 
                    {
 1329 
                    {
1341 
                        $emsg = '';
 1330 
                        $emsg = '';
1342 
                    }
 1331 
                    }
1343 
                }
 1332 
                }
- 
 
 1333 
                else
- 
 
 1334 
                {
- 
 
 1335 
                    #
- 
 
 1336 
                    #   Transfer then delete to local directory
- 
 
 1337 
                    #
- 
 
 1338 
                    unless (-d $tdir)
- 
 
 1339 
                    {
- 
 
 1340 
                        eval { mkpath($tdir) };
- 
 
 1341 
                        ReportError ("Did not create quarantine target: $tdir")
- 
 
 1342 
                            unless (-d $tdir);
- 
 
 1343 
                    }
- 
 
 1344 
 
- 
 
 1345 
                    if (-d $tdir)
- 
 
 1346 
                    {
- 
 
 1347 
                        $rv = system ('mv', '-n', $path, $tdir);
- 
 
 1348 
                        if ( $rv )
- 
 
 1349 
                        {
- 
 
 1350 
                            ReportError ("Move $path to $tdir");
- 
 
 1351 
                            $statistics{'QuarantineError'}++;
- 
 
 1352 
 
- 
 
 1353 
                            #
- 
 
 1354 
                            # Clean up what may have been moved
- 
 
 1355 
                            # NOTE: deleted so that we don't loose stuff if it gets ugly
- 
 
 1356 
            #                rmtree( $tpath);
- 
 
 1357 
            #                rmdir ($tdir);
- 
 
 1358 
                        }
- 
 
 1359 
                        else
- 
 
 1360 
                        {
- 
 
 1361 
                            $emsg = '';
- 
 
 1362 
                        }
- 
 
 1363 
                    }
- 
 
 1364 
                }
1344 
            }
 1365 
            }
1345 
        }
 1366 
        }
1346 
        else
 1367 
        else
1347 
        {
 1368 
        {
1348 
            Verbose2("Test: 'mv', '$path', '$tdir'");
 1369 
            Verbose2("Test: 'mv', '$path', '$tdir'");