From 398a4da313a2179a8f9f74fabc142132721c0fbd Mon Sep 17 00:00:00 2001 From: Olivier Sallou Date: Tue, 13 Aug 2013 10:43:29 +0200 Subject: [PATCH] make mirror mandatory in manifest --- base/manifest-schema.json | 2 +- common/tasks/bootstrap.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/base/manifest-schema.json b/base/manifest-schema.json index 50780ad..a8065b0 100644 --- a/base/manifest-schema.json +++ b/base/manifest-schema.json @@ -16,7 +16,7 @@ "device" : { "type" : "string" }, "mirror": { "type": "string" } }, - "required": ["mount_dir"] + "required": ["mount_dir", "mirror"] }, "system": { "type": "object", diff --git a/common/tasks/bootstrap.py b/common/tasks/bootstrap.py index a1f6ca0..a41d697 100644 --- a/common/tasks/bootstrap.py +++ b/common/tasks/bootstrap.py @@ -13,10 +13,7 @@ def get_bootstrap_args(info): options.append('--include=' + ','.join(include)) if len(exclude) > 0: options.append('--exclude=' + ','.join(exclude)) - if info.manifest.bootstrapper['mirror']: - mirror = info.manifest.bootstrapper['mirror'] - else: - mirror = 'http://http.debian.net/debian' + mirror = info.manifest.bootstrapper['mirror'] arguments = [info.manifest.system['release'], info.root, mirror] return executable, options, arguments