grahamc/hydra - Change D3DIBMOKXK2E65267BEEWQL4S4NSHGZBCY7YTU34JSEPZ7AKNBRQC

* For products that are directories (like manuals), allow a default

suffix other than index.html to be declared. E.g. if a build does

echo &quot;doc manual $out manual.html&quot; &gt;&gt; $out&#x2f;nix-support&#x2f;hydra-build-products

the default link for the product is

http:&#x2f;&#x2f;localhost:3000&#x2f;build&#x2f;417&#x2f;download&#x2f;1&#x2f;manual.html

but other files are also accessible, e.g.

http:&#x2f;&#x2f;localhost:3000&#x2f;build&#x2f;417&#x2f;download&#x2f;1&#x2f;style.css

Created by Eelco Dolstra on March 6, 2009

D3DIBMOKXK2E65267BEEWQL4S4NSHGZBCY7YTU34JSEPZ7AKNBRQC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/lib/Hydra/Controller/Build.pm at line 83 [4.1]
B:BD[4.2343] → [4.2343:2398]
```
    my ($self, $c, $productnr, $filename, @path) = @_;
```
[4.2343]
[4.2398]
```
    my ($self, $c, $productnr, @path) = @_;
```

Insertion in src/lib/Hydra/Controller/Build.pm at line 90 [4.1]

[4.2672]

    # If the product has a name, then the first path element can be
    # ignored (it's the name included in the URL for informational purposes).
    shift @path if $product->name;

Insertion in src/lib/Hydra/Controller/Build.pm at line 110 [4.1]
[5.1405]
[4.3258]
```
    notFound($c, "Path $path is a directory.") if -d $path;
```

Replacement in src/lib/Hydra/Schema/BuildInputs.pm at line 39 [6.1]

B:BD[6.782] → [7.725:867]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7Th7GxvR7m/DdodQqlmJXQ

[6.782]

[6.924]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:H25BhHe9wbU6nj6fSKjZnw

Insertion in src/lib/Hydra/Schema/BuildProducts.pm at line 30 [9.4268]
[8.809]
[9.4698]
```
  { data_type => "text", is_nullable => 0, size => undef },
  "defaultpath",
```

Replacement in src/lib/Hydra/Schema/BuildProducts.pm at line 38 [9.4268]

B:BD[9.4922] → [7.868:1010]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FFVpdoV0vBLhF9yyKJSoTA

[9.4922]

[9.5064]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:rfkj/A+Li7Q0hWydqtJHAw

Replacement in src/lib/Hydra/Schema/BuildResultInfo.pm at line 34 [10.1594]

B:BD[10.2382] → [7.1011:1153]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CkjyZptB79J32VhDbXhKEg

[10.2382]

[10.2524]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wmL9881G+dZrgHKM83dHXw

Replacement in src/lib/Hydra/Schema/BuildSchedulingInfo.pm at line 30 [10.3773]

B:BD[10.4473] → [7.1154:1296]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HeodRHEOs/do8RKwDJhaXg

[10.4473]

[10.4615]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6cTj5JovtTmtemvQjWtucQ

Replacement in src/lib/Hydra/Schema/BuildSteps.pm at line 38 [11.1675]

B:BD[11.2816] → [7.1297:1439]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kKpIuRMrqdh7m4M5XPIEgg

[11.2816]

[11.2958]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LyNlkn5XjBnLp7M4ipB/ZQ

Replacement in src/lib/Hydra/Schema/Builds.pm at line 79 [9.5202]

B:BD[9.6194] → [7.1515:1657]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fGOOscNFEgDZpeVpA6HH0w

[9.6194]

[10.3377]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8U9CmcfeowLJVViKiR3n1g

Replacement in src/lib/Hydra/Schema/CachedPathInputs.pm at line 25 [12.859]

B:BD[12.1497] → [7.1658:1800]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0wY3JTSelPQSTbxpNQDJjg

[12.1497]

[12.1639]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+F3EiYsvXuOjnGDrkhLxng

Replacement in src/lib/Hydra/Schema/CachedSubversionInputs.pm at line 23 [12.1780]

B:BD[12.2342] → [7.1801:1943]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eZPs3SB3XZW5BNQOQFrFBw

[12.2342]

[12.2484]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:O0QvXjOulMVTjhW4rRHkmQ

Replacement in src/lib/Hydra/Schema/JobsetInputAlts.pm at line 34 [13.825]

B:BD[13.1831] → [7.1944:2086]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:atlyxsSKg41KbDkbCfuvHQ

[13.1831]

[13.1973]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qXh+0QbMUHIDmQCG9T5qdA

Replacement in src/lib/Hydra/Schema/JobsetInputs.pm at line 46 [14.590]

B:BD[14.1681] → [7.2087:2229]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:85ro4sVmhc3HwAjgoA6p6w

[14.1681]

[14.1823]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TUTdwfhSsFMKBXa/wKenOQ

Replacement in src/lib/Hydra/Schema/Jobsets.pm at line 53 [14.1960]

B:BD[14.2992] → [7.2230:2372]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:c5PqrzN43jEGGrzKqI6WWQ

[14.2992]

[14.3134]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dVevQ8lPI2/IRpYoJgzLBA

Replacement in src/lib/Hydra/Schema/Projects.pm at line 48 [14.3266]

B:BD[14.3685] → [7.2373:2515]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7iZYMDM+wn+Neud0Fm1ZMA

[14.3685]

[14.3827]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Q5mSKzMxB9px2ja8NjK/9Q

Replacement in src/lib/Hydra/Schema/ReleaseSetJobs.pm at line 35 [15.5076]

B:BD[15.6070] → [7.2516:2658]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Rs3CRPpzFi30sAeHVe1yQA

[15.6070]

[15.6212]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+Ky8V3sZIgT22hgF27Y0cw

Replacement in src/lib/Hydra/Schema/ReleaseSets.pm at line 32 [15.6351]

B:BD[15.7142] → [7.2659:2801]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PA+dfXHaBsSx9kE1mEZZ9w

[15.7142]

[15.7284]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:f+4AnWTJsi4RDfxoJxECgw

Replacement in src/lib/Hydra/Schema/SystemTypes.pm at line 19 [16.1717]

B:BD[16.2105] → [7.2802:2944]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:olHboRdtxD6E7Ukr4aCLCA

[16.2105]

[16.2247]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Af/LU15/hpXngfrBrDMI/A

Replacement in src/lib/Hydra/Schema/UserRoles.pm at line 20 [17.3263]

B:BD[17.3736] → [7.2945:3087]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Q7Nd3wv7Y3184GhkE/pdFA

[17.3736]

[17.3878]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/yDlbFhRYDzf+0VHzygrhA

Replacement in src/lib/Hydra/Schema/Users.pm at line 33 [18.3258]

B:BD[18.3782] → [7.3088:3230]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:z8fRKy//Mx8wqymMgOcrWA

[18.3782]

[18.3924]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:d7M/Q6OucU9NUCSB5zZK7Q

Replacement in src/lib/Hydra/Schema.pm at line 11 [9.6376]

B:BD[9.6498] → [7.3231:3373]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-04 14:50:30
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QcB8T/bY2/Pw34uuYXt2Cw

[9.6498]

[9.6640]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2009-03-06 14:20:12
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hRwus0A1vxnFCzQxghFgTw

Replacement in src/root/common.tt at line 45 [19.2803]

B:BD[3.227] → [3.227:401]

                     [% IF build.schedulingInfo.busy %]runningBuild[% END %] [% IF build.schedulingInfo.disabled == 1 || build.project.enabled == 0 %]disabledBuild[% END -%]

[3.227]

[3.401]

                     [% IF build.schedulingInfo.busy %]runningBuild[% ELSIF build.schedulingInfo.disabled == 1 || build.project.enabled == 0 %]disabledBuild[% END %]

Replacement in src/root/product-list.tt at line 9 [21.3098]

B:BD[20.2174] → [4.3992:4081]

      [% uri = c.uri_for('/build' build.id 'download' product.productnr product.name) %]

[20.2174]

[20.2262]

      [% uri = "${c.uri_for('/build' build.id 'download' product.productnr)}"
          _ (product.name ? "/" _ product.name : "")
          _ (product.defaultpath ? "/" _ product.defaultpath : "") %]

Replacement in src/script/hydra_build.pl at line 212 [22.2912]

B:BD[22.5818] → [23.2690:2753]

                    /^([\w\-]+)\s+([\w\-]+)\s+(\S+)$/ or next;

[22.5818]

[22.5875]

                    /^([\w\-]+)\s+([\w\-]+)\s+(\S+)(\s+(\S+))?$/ or next;

Insertion in src/script/hydra_build.pl at line 216 [22.2912]
[22.5983]
[2.0]
```
                    my $defaultPath = $5;
```

Insertion in src/script/hydra_build.pl at line 221 [22.2912]

[8.3841]

[24.1233]

                    # !!! validate $path, $defaultPath

Insertion in src/script/hydra_build.pl at line 235 [22.2912]

[24.1773]

[8.4182]


                    my $name = $path eq $outPath ? "" : basename $path;

Replacement in src/script/hydra_build.pl at line 247 [22.2912]

B:BD[8.4397] → [8.4397:4446]

                        , name => basename $path

[8.4397]

[22.6257]

                        , name => $name
                        , defaultpath => $defaultPath

Insertion in src/script/hydra_build.pl at line 282 [22.2912]
[10.8088]
[10.8088]
```
    die "build $buildId already done" if defined $build->resultInfo;
```

Insertion in src/script/hydra_build.pl at line 289 [22.2912]

[10.8345]

[22.7245]

    $build->buildsteps->delete_all;
    $build->buildproducts->delete_all;

Insertion in src/sql/hydra.sql at line 143 [25.1]

[8.4867]

    defaultPath   text, -- if `path' is a directory, the default file relative to `path' to be served