From 96a1683c26f7f4b174ca5a4ca0d6a2b82609d8d8 Mon Sep 17 00:00:00 2001 From: Rick Wright Date: Fri, 5 Sep 2014 13:56:50 -0700 Subject: [PATCH] Fix task ordering to better support customizations This ensures that preferences are written before apt update and also ensures that in GCE the backports are added to the sources before the provider-specific SetPackageRepositories happens. Change-Id: I3c85f922c49c2a6fbd3c0f2bad1072eff0d098c8 --- bootstrapvz/common/tasks/apt.py | 2 +- bootstrapvz/providers/gce/tasks/apt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrapvz/common/tasks/apt.py b/bootstrapvz/common/tasks/apt.py index 2cda135..298a956 100644 --- a/bootstrapvz/common/tasks/apt.py +++ b/bootstrapvz/common/tasks/apt.py @@ -128,7 +128,7 @@ class DisableDaemonAutostart(Task): class AptUpdate(Task): description = 'Updating the package cache' phase = phases.package_installation - predecessors = [locale.GenerateLocale, WriteSources] + predecessors = [locale.GenerateLocale, WriteSources, WritePreferences] @classmethod def run(cls, info): diff --git a/bootstrapvz/providers/gce/tasks/apt.py b/bootstrapvz/providers/gce/tasks/apt.py index 1e85808..229656a 100644 --- a/bootstrapvz/providers/gce/tasks/apt.py +++ b/bootstrapvz/providers/gce/tasks/apt.py @@ -9,7 +9,7 @@ import os class SetPackageRepositories(Task): description = 'Adding apt sources' phase = phases.preparation - predecessors = [apt.AddManifestSources] + predecessors = [apt.AddManifestSources, apt.AddBackports] @classmethod def run(cls, info):