grahamc/hydra - Change A43SLRSH6OIIEZWLRKLMERX7HOMBICKG7WHELCZYLOJWZ3JFRV2AC

Fix handling of IPC::Run::run exit status

Turns out that the exit status is returned in $?, not as the return value of run(). So our error checking was completely bogus.

Created by Eelco Dolstra on January 23, 2013

A43SLRSH6OIIEZWLRKLMERX7HOMBICKG7WHELCZYLOJWZ3JFRV2AC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/lib/Hydra/Controller/Admin.pm at line 427 [9.1]

B:BD[8.423] → [3.180:293]

    (my $res, my $stdout, my $stderr) = captureStdoutStderr(60, ("hydra-evaluator", $projectName, $jobsetName));

[8.423]

[8.424]

    captureStdoutStderr(60, "hydra-evaluator", $projectName, $jobsetName);

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 119 [11.2663]

B:BD[10.678] → [10.678:742]

            or die "Cannot copy path $uri to the Nix store.\n";

[10.678]

[10.742]

            or die "cannot copy path $uri to the Nix store.\n";

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 173 [11.2663]

B:BD[12.217] → [12.217:361]

        die "Cannot get head revision of Subversion repository at `$uri':\n$stderr"
            unless IPC::Run::run(@cmd, \$stdout, \$stderr);

[12.217]

[5.0]

        IPC::Run::run(@cmd, \$stdout, \$stderr);
        die "cannot get head revision of Subversion repository at `$uri':\n$stderr" if $?;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 197 [11.2663]

∅:D[13.493] → [14.0:63]

B:BD[15.257] → [14.0:63]

B:BD[14.63] → [13.494:560]

        (my $res, $stdout, $stderr) = captureStdoutStderr(600,
            ("svn", "checkout", $uri, "-r", $revision, $wcPath));

[13.493]

[13.560]

        (my $res, $stdout, $stderr) = captureStdoutStderr(600, "svn", "checkout", $uri, "-r", $revision, $wcPath);
        die "error checking out Subversion repo at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 325 [11.2663]

B:BD[16.318] → [16.318:378]

∅:D[16.378] → [17.0:70]

B:BD[18.271] → [17.0:70]

∅:D[19.49] → [18.320:390]

∅:D[17.70] → [18.320:390]

∅:D[20.132] → [18.320:390]

B:BD[18.320] → [18.320:390]

        ($res, $stdout, $stderr) = captureStdoutStderr(600,
            ("git", "clone", "--branch", $branch, $uri, $clonePath));
        die "Error cloning git repo at `$uri':\n$stderr" unless $res;

[16.318]

[18.390]

        ($res, $stdout, $stderr) = captureStdoutStderr(600, "git", "clone", "--branch", $branch, $uri, $clonePath);
        die "error cloning git repo at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 335 [11.2663]

B:BD[21.264] → [21.264:328]

        ("git", "fetch", "-fu", "origin", "+$branch:$branch"));

[21.264]

[6.0]

        "git", "fetch", "-fu", "origin", "+$branch:$branch");

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 337 [11.2663]

B:BD[6.56] → [6.56:112]

∅:D[6.112] → [21.328:414]

B:BD[21.328] → [21.328:414]

        ("git", "fetch", "-fu", "origin")) unless $res;
    die "Error fetching latest change from git repo at `$uri':\n$stderr" unless $res;

[6.56]

[18.563]

        "git", "fetch", "-fu", "origin") if $res;
    die "error fetching latest change from git repo at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 342 [11.2663]

B:BD[16.1388] → [16.1388:1485]

    die "Error getting revision number of Git branch '$branch' at `$uri':\n$stderr" unless $res;

[16.1388]

[22.515]

    die "error getting revision number of Git branch '$branch' at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 345 [11.2663]

∅:D[23.240] → [24.359:405]

∅:D[16.1528] → [24.359:405]

B:BD[24.359] → [24.359:405]

B:BD[24.405] → [16.1529:1642]

    die unless $revision =~ /^[0-9a-fA-F]+$/;
    die "Error getting a well-formated revision number of Git branch '$branch' at `$uri':\n$stdout" unless $res;

[16.1528]

[24.405]

    die "error getting a well-formated revision number of Git branch '$branch' at `$uri':\n$stdout"
        unless $revision =~ /^[0-9a-fA-F]+$/;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 355 [11.2663]

B:BD[16.1890] → [16.1890:2082]

        ($res, $stdout, $stderr) = captureStdoutStderr(600,
            ("git", "checkout", "$branch"));
        die "Error checking out Git branch '$branch' at `$uri':\n$stderr" unless $res;

[16.1890]

[25.237]

        ($res, $stdout, $stderr) = captureStdoutStderr(600, "git", "checkout", "$branch");
        die "error checking out Git branch '$branch' at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 362 [11.2663]

B:BD[16.2308] → [16.2308:2464]

                ("tg", "remote", "--populate", "origin"));
            print STDERR "Warning: `tg remote --populate origin' failed:\n$stderr" unless $res;

[16.2308]

[16.2464]

                "tg", "remote", "--populate", "origin");
            print STDERR "warning: `tg remote --populate origin' failed:\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 400 [11.2663]

B:BD[26.1] → [16.3442:3502]

∅:D[16.3502] → [27.0:58]

B:BD[14.299] → [27.0:58]

∅:D[27.58] → [10.7529:7625]

∅:D[14.351] → [10.7529:7625]

B:BD[10.7529] → [10.7529:7625]

        ($res, $stdout, $stderr) = captureStdoutStderr(600,
            ("nix-prefetch-git", $clonePath, $revision));
        die "Cannot check out Git repository branch '$branch' at `$uri':\n$stderr" unless $res;

[26.1]

[26.2]

        ($res, $stdout, $stderr) = captureStdoutStderr(600, "nix-prefetch-git", $clonePath, $revision);
        die "cannot check out Git repository branch '$branch' at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 453 [11.2663]

B:BD[28.394] → [28.394:582]

        (my $res, $stdout, $stderr) = captureStdoutStderr(600,
            ("bzr", "branch", $uri, $clonePath));
        die "Error cloning bazaar branch at `$uri':\n$stderr" unless $res;

[28.394]

[28.582]

        (my $res, $stdout, $stderr) = captureStdoutStderr(600, "bzr", "branch", $uri, $clonePath);
        die "error cloning bazaar branch at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 458 [11.2663]

B:BD[28.621] → [28.621:791]

    (my $res, $stdout, $stderr) = captureStdoutStderr(600,
        ("bzr", "pull"));
    die "Error pulling latest change bazaar branch at `$uri':\n$stderr" unless $res;

[28.621]

[28.791]

    (my $res, $stdout, $stderr) = captureStdoutStderr(600, "bzr", "pull");
    die "error pulling latest change bazaar branch at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 462 [11.2663]

B:BD[28.854] → [28.854:942]

    my @cmd = (["bzr", "revno"],
               "|", ["sed", 's/^ *\([0-9]*\).*/\1/']);

[28.854]

[28.942]

    my @cmd = (["bzr", "revno"], "|", ["sed", 's/^ *\([0-9]*\).*/\1/']);

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 464 [11.2663]

B:BD[28.943] → [28.943:1071]

    die "Cannot get head revision of Bazaar branch at `$uri':\n$stderr"
        unless IPC::Run::run(@cmd, \$stdout, \$stderr);

[28.943]

[28.1071]

    IPC::Run::run(@cmd, \$stdout, \$stderr);
    die "cannot get head revision of Bazaar branch at `$uri':\n$stderr" if $?;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 484 [11.2663]

B:BD[28.1817] → [28.1817:1950]

            ("nix-prefetch-bzr", $clonePath, $revision));
        die "Cannot check out Bazaar branch `$uri':\n$stderr" unless $res;

[28.1817]

[28.1950]

            "nix-prefetch-bzr", $clonePath, $revision);
        die "cannot check out Bazaar branch `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 523 [11.2663]

B:BD[29.612] → [29.612:736]

            ("hg", "clone", $uri, $clonePath));
        die "Error cloning mercurial repo at `$uri':\n$stderr" unless $res;

[29.612]

[29.736]

            "hg", "clone", $uri, $clonePath);
        die "error cloning mercurial repo at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 529 [11.2663]

B:BD[29.801] → [29.801:971]

    (my $res, $stdout, $stderr) = captureStdoutStderr(600,
        ("hg", "pull"));
    die "Error pulling latest change mercurial repo at `$uri':\n$stderr" unless $res;

[29.801]

[29.971]

    (my $res, $stdout, $stderr) = captureStdoutStderr(600, "hg", "pull");
    die "error pulling latest change mercurial repo at `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 532 [11.2663]

B:BD[29.972] → [30.0:131]

∅:D[30.131] → [31.171:258]

∅:D[32.167] → [31.171:258]

B:BD[31.171] → [31.171:258]

    (my $res1, $stdout, $stderr) = captureStdoutStderr(600,("hg", "log", "-r", $id, "--template", "{node|short} {rev} {branch}"));
    die "Error getting branch and revision of $id from `$uri':\n$stderr" unless $res1;

[29.972]

[29.1142]

    (my $res1, $stdout, $stderr) = captureStdoutStderr(600,
        "hg", "log", "-r", $id, "--template", "{node|short} {rev} {branch}");
    die "error getting branch and revision of $id from `$uri':\n$stderr" if $res1;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 552 [11.2663]

B:BD[29.1878] → [2.0:57]

∅:D[2.57] → [29.1929:2011]

B:BD[29.1929] → [29.1929:2011]

            ("nix-prefetch-hg", $clonePath, $revision));
        die "Cannot check out Mercurial repository `$uri':\n$stderr" unless $res;

[29.1878]

[29.2011]

            "nix-prefetch-hg", $clonePath, $revision);
        die "cannot check out Mercurial repository `$uri':\n$stderr" if $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 619 [11.2663]

B:BD[11.10328] → [11.10328:10391]

        die "Input `" . $name . "' has unknown type `$type'.";

[11.10328]

[11.10391]

        die "input `" . $name . "' has unknown type `$type'.";

Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 705 [11.2663]
∅:D[13.1377] → [14.385:398]
B:BD[14.385] → [14.385:398]
```
    my $res;
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 712 [11.2663]
∅:D[14.556] → [33.2468:2469]
B:BD[11.10399] → [33.2468:2469]
B:BD[33.2469] → [14.557:623]
```
        $res = IPC::Run::run(\@cmd, \$stdin, \$stdout, \$stderr);
```
[14.556]
[14.623]
```
        IPC::Run::run(\@cmd, \$stdin, \$stdout, \$stderr);
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 717 [11.2663]

B:BD[34.22] → [12.1497:1567]

B:BD[12.1567] → [16.3542:3583]

        die unless $@ eq "timeout\n";   # propagate unexpected errors
        return (undef, "", "timeout\n");

[34.22]

[34.116]

        die unless $@ eq "timeout\n"; # propagate unexpected errors
        return (-1, "", "timeout\n");

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 720 [11.2663]
B:BD[34.129] → [12.1606:1647]
```
        return ($res, $stdout, $stderr);
```
[34.129]
[34.163]
```
        return ($?, $stdout, $stderr);
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 729 [11.2663]

B:BD[33.2609] → [33.2609:2779]

        or die "Cannot find the input containing the job expression.\n";
    die "Multiple alternatives for the input containing the Nix expression are not supported.\n"

[33.2609]

[33.2779]

        or die "cannot find the input containing the job expression.\n";
    die "multiple alternatives for the input containing the Nix expression are not supported.\n"

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 738 [11.2663]

B:BD[14.906] → [35.2530:2650]

∅:D[36.116] → [33.3093:3181]

∅:D[37.236] → [33.3093:3181]

∅:D[14.1013] → [33.3093:3181]

∅:D[35.2650] → [33.3093:3181]

B:BD[33.3093] → [33.3093:3181]

        ($evaluator, $nixExprFullPath, "--gc-roots-dir", getGCRootsDir, "-j", 1, inputsToArgs($inputInfo, $exprType)));
    die "Cannot evaluate the Nix expression containing the jobs:\n$stderr" unless $res;

[14.906]

[33.3181]

        $evaluator, $nixExprFullPath, "--gc-roots-dir", getGCRootsDir, "-j", 1, inputsToArgs($inputInfo, $exprType));
    die "cannot evaluate the Nix expression containing the jobs:\n$stderr" if $res;

Replacement in tests/Makefile.am at line 27 [40.92]
∅:D[38.223] → [39.429:437]
B:BD[39.429] → [39.429:437]
```
clean :
```
[39.429]
[41.25]
```
clean:
```
Insertion in tests/Makefile.am at line 30 [40.92]
[42.157]
[40.125]
```
	rm -f .*-state
```

Replacement in tests/Makefile.am at line 34 [40.92]

B:BD[40.148] → [43.0:51]

db.sqlite : $(top_srcdir)/src/sql/hydra-sqlite.sql

[40.148]

[4.59]

db.sqlite: $(top_srcdir)/src/sql/hydra-sqlite.sql

Replacement in tests/Makefile.am at line 37 [40.92]
B:BD[44.1] → [45.0:13]
```
repos : dirs
```
[44.1]
[40.252]
```
repos: dirs
```
Replacement in tests/Makefile.am at line 39 [40.92]
B:BD[40.253] → [46.37764:37771]
```
dirs :
```
[40.253]
[47.157]
```
dirs:
```
Replacement in tests/Setup.pm at line 69 [39.518]
B:BD[7.1755] → [7.1755:1772]
```
    return $res;
```
[7.1755]
[48.1482]
```
    return !$res;
```

Replacement in tests/Setup.pm at line 75 [39.518]

B:BD[7.1897] → [7.1897:1971]

    print "STDERR: $stderr" if $res;
    return ($res, $stdout, $stderr);

[7.1897]

[16.4328]

    print "STDERR: $stderr" if $stderr ne "";
    return !$res;

Replacement in tests/Setup.pm at line 82 [39.518]

B:BD[7.2077] → [7.2077:2145]

    die "Unexpected update error with $scm: $stderr\n" unless $res;

[7.2077]

[7.2145]

    die "unexpected update error with $scm: $stderr\n" if $res;