From 210999ff5d494430a6f4cfe3a75b4dc39729174e Mon Sep 17 00:00:00 2001 From: Tiago Ilieve Date: Sat, 12 Jul 2014 13:28:46 -0300 Subject: [PATCH] Remove redundant code from GCE's `tasks.apt` GCE's `tasks.apt.SetPackageRepositories` was adding duplicated entries to apt `info.source_lists`, even ignoring the package mirror specified on manifest. --- bootstrapvz/providers/gce/tasks/apt.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/bootstrapvz/providers/gce/tasks/apt.py b/bootstrapvz/providers/gce/tasks/apt.py index 733c1c6..4d620a3 100644 --- a/bootstrapvz/providers/gce/tasks/apt.py +++ b/bootstrapvz/providers/gce/tasks/apt.py @@ -6,19 +6,12 @@ import os class SetPackageRepositories(Task): - description = 'Adding apt sources' + description = 'Adding goog apt source' phase = phases.preparation successors = [apt.AddManifestSources] @classmethod def run(cls, info): - components = 'main' - if 'components' in info.manifest.system: - components = ' '.join(info.manifest.system['components']) - info.source_lists.add('main', 'deb http://http.debian.net/debian {system.release} ' + components) - info.source_lists.add('main', 'deb-src http://http.debian.net/debian {system.release} ' + components) - info.source_lists.add('backports', 'deb http://http.debian.net/debian {system.release}-backports ' + components) - info.source_lists.add('backports', 'deb-src http://http.debian.net/debian {system.release}-backports ' + components) info.source_lists.add('goog', 'deb http://goog-repo.appspot.com/debian pigeon main')