Merge lp:~pwlars/ubuntu-qa-website/add-armel-netbook into lp:~ubuntu-qa-website-devel/ubuntu-qa-website/trunk

Proposed by Paul Larson
Status: Merged
Merged at revision: not available
Proposed branch: lp:~pwlars/ubuntu-qa-website/add-armel-netbook
Merge into: lp:~ubuntu-qa-website-devel/ubuntu-qa-website/trunk
Diff against target: 20 lines (+8/-2)
1 file modified
code/modules/qatracker/qatracker.display.php (+8/-2)
To merge this branch: bzr merge lp:~pwlars/ubuntu-qa-website/add-armel-netbook
Reviewer Review Type Date Requested Status
Ubuntu QA Website Developers Pending
Review via email: mp+19112@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

New version of this that just looks for armel under Ubuntu Netbook images

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'code/modules/qatracker/qatracker.display.php'
2--- code/modules/qatracker/qatracker.display.php 2010-01-14 17:15:16 +0000
3+++ code/modules/qatracker/qatracker.display.php 2010-02-11 16:36:32 +0000
4@@ -1029,8 +1029,14 @@
5 $url['path']="http://archive.ubuntu.com/ubuntu/dists/".$url['release']."/main/installer-".$url['arch']."/current/images/";
6 }
7 elseif (ereg("Ubuntu Netbook",$info->product)) {
8- $url['type']="/ubuntu-netbook/daily-live/";
9- $url['file']=$url['release']."-netbook-i386.iso";
10+ if (ereg("armel",$info->product)) {
11+ $url['type']="/ubuntu-netbook/ports/daily-live/";
12+ $url['file']=$url['release']."-netbook-".$url['arch'].".img";
13+ }
14+ else {
15+ $url['type']="/ubuntu-netbook/daily-live/";
16+ $url['file']=$url['release']."-netbook-i386.iso";
17+ }
18 }
19 elseif (ereg("Kubuntu Netbook",$info->product)) {
20 $url['type']="/kubuntu-netbook/daily-live/";

Subscribers

People subscribed via source and target branches

to status/vote changes: