~primes2h/+junk/ubuntu-qa-website

Merge arm change from Paul Larson

added added

removed removed

1029

$url['path']="http://archive.ubuntu.com/ubuntu/dists/".$url['release']."/main/installer-".$url['arch']."/current/images/";

1030

}

1031

elseif (ereg("Ubuntu Netbook",$info->product)) {

1032

$url['type']="/ubuntu-netbook/daily-live/";

1033

$url['file']=$url['release']."-netbook-i386.iso";

1032

if (ereg("armel",$info->product)) {

1033

$url['type']="/ubuntu-netbook/ports/daily-live/";

1034

$url['file']=$url['release']."-netbook-".$url['arch'].".img";

1035

}

1036

else {

1037

$url['type']="/ubuntu-netbook/daily-live/";

1038

$url['file']=$url['release']."-netbook-i386.iso";

1039

}

1034

1040

}

1035

1041

elseif (ereg("Kubuntu Netbook",$info->product)) {

1036

1042

$url['type']="/kubuntu-netbook/daily-live/";