Merge lp:~stevenk/launchpad/netbook-cron into lp:launchpad

Proposed by Steve Kowalik
Status: Merged
Approved by: Julian Edwards
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~stevenk/launchpad/netbook-cron
Merge into: lp:launchpad
Diff against target: 21 lines (+2/-2)
1 file modified
cronscripts/publishing/cron.germinate (+2/-2)
To merge this branch: bzr merge lp:~stevenk/launchpad/netbook-cron
Reviewer Review Type Date Requested Status
Данило Шеган (community) release-critical Approve
Julian Edwards (community) Approve
Colin Watson (community) Approve
Review via email: mp+16115@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Kowalik (stevenk) wrote :

This changes germinate ran by the publisher to use the new netbook seed collection, as opposed to unr, and stops it looking at the mobile seed collection.

Revision history for this message
Colin Watson (cjwatson) wrote :

This is Steve's team's call; technically the change looks fine.

 review approve

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve
Revision history for this message
Данило Шеган (danilo) :
review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'cronscripts/publishing/cron.germinate'
--- cronscripts/publishing/cron.germinate 2009-08-21 09:10:55 +0000
+++ cronscripts/publishing/cron.germinate 2009-12-14 05:06:39 +0000
@@ -32,7 +32,7 @@
32cd $GERMINATEROOT32cd $GERMINATEROOT
3333
34# Clean up temporary files34# Clean up temporary files
35rm -f germinate.output ALL ALL.sources UBUNTU-* KUBUNTU-* EDUBUNTU-* XUBUNTU-* MOBILE-* MYTHBUNTU-* UNR-*35rm -f germinate.output ALL ALL.sources UBUNTU-* KUBUNTU-* EDUBUNTU-* XUBUNTU-* MYTHBUNTU-* NETBOOK-*
36rm -f all_* all.sources_*36rm -f all_* all.sources_*
3737
38# Grab a local copy of Sources files38# Grab a local copy of Sources files
@@ -41,7 +41,7 @@
41done41done
4242
43> "$MISCROOT/more-extra.override.$suite.main.new"43> "$MISCROOT/more-extra.override.$suite.main.new"
44for distro in ubuntu kubuntu edubuntu xubuntu mobile mythbuntu unr; do44for distro in ubuntu kubuntu edubuntu xubuntu mythbuntu netbook; do
45 DISTRO="$(echo $distro | tr a-z A-Z)"45 DISTRO="$(echo $distro | tr a-z A-Z)"
46 germinate_suite="$distro.$suite"46 germinate_suite="$distro.$suite"
47 germinate_components=main,universe,restricted,multiverse47 germinate_components=main,universe,restricted,multiverse