diff --git a/Base/utils.xml b/Base/utils.xml index f5ca9cf..53d9da6 100644 --- a/Base/utils.xml +++ b/Base/utils.xml @@ -1,10 +1,10 @@ - + - + diff --git a/Metadata/groups.xml b/Metadata/groups.xml index d523cbe..816aa78 100644 --- a/Metadata/groups.xml +++ b/Metadata/groups.xml @@ -253,13 +253,13 @@ - + - + diff --git a/Python/etc/apt/sources.list b/Python/etc/apt/sources.list index 44a61ff..20e5e07 100644 --- a/Python/etc/apt/sources.list +++ b/Python/etc/apt/sources.list @@ -3,14 +3,28 @@ include("mode/space") header() +# Recherche de la distribution +distros = [x.split("=", 1)[1] for x in metadata.groups if x.startswith("debian-version=")] +if len(distros) == 0: + raise Exception("aucune distribution définie") +elif len(distros) > 1: + raise Exception("plusieurs distrubutions définient") +else: + [distro] = distros + +# Dépôt +if has("debian-mirror"): + repo = "file:/mirror" +else: + repo = "ftp://mirror.adm.crans.org" + def source(args): - print "deb %s%s" % (prefix, args) - print "deb-src %s%s" % (prefix, args) + print "deb " + args + print "deb-src " + args if has("ovh"): - prefix = "" - source("ftp://mir1.ovh.net/debian/ etch main contrib") - source("http://security.debian.org/ etch/updates main") + source("ftp://mir1.ovh.net/debian/ %s main contrib" % distro) + source("http://security.debian.org/ %s/updates main" % distro) @# Paquet construit a la main source("ftp://mirror.adm.crans.org/custom ./")