From: Michael Hanke <michael.hanke@gmail.com>
Date: Fri, 8 Oct 2010 15:29:55 +0000 (-0400)
Subject: Add a permanent 'data' distribution.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c12f04f12859dfd4d64a6b9f810b4b4f2b7382e1;p=neurodebian.git

Add a permanent 'data' distribution.
---

diff --git a/neurodebian.cfg b/neurodebian.cfg
index c69875c..66c4b61 100644
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -44,6 +44,7 @@ us-tn = http://masi.vuse.vanderbilt.edu/neurodebian
 [neurodebian]
 # Release files of all repositories to be contained in the website
 releases =
+ http://neuro.debian.net/debian/dists/data/Release
  http://neuro.debian.net/debian/dists/dapper/Release
  http://neuro.debian.net/debian/dists/gutsy/Release
  http://neuro.debian.net/debian/dists/hardy/Release
@@ -58,6 +59,7 @@ releases =
  http://neuro.debian.net/debian/dists/sid/Release
 
 [release codenames]
+data = Datasets
 etch = Debian GNU/Linux 4.0 (etch)
 lenny = Debian GNU/Linux 5.0 (lenny)
 squeeze = Debian testing (squeeze)
@@ -79,6 +81,7 @@ maverick = Ubuntu upcoming release "Maverick Meerkat" (maverick)
 # that allow proper sorting (upgradability) across distribution releases
 # For Debian we'll use ndXX (where XX is the version of the Debian release,
 # e.g. 50; analog to backports.org) and for Ubuntu we'll use ndXX.XX.
+data = nd
 etch = nd40
 lenny = nd50
 squeeze = nd60
diff --git a/neurodebian/dde.py b/neurodebian/dde.py
index 45afb25..dc2961c 100755
--- a/neurodebian/dde.py
+++ b/neurodebian/dde.py
@@ -432,6 +432,8 @@ def dde_get(url, fail=False):
 def nitrc_get(spec, fail=False):
     nitrc_url = 'http://www.nitrc.org/export/site/projects.json.php'
     try:
+        # change into this from python 2.6 on
+        #data = json.loads(urllib2.urlopen(nitrc_url + '?spec=%s' % spec).read())
         data = json.read(urllib2.urlopen(nitrc_url + '?spec=%s' % spec).read())
         print "NITRC-SUCCESS:", spec
     except urllib2.HTTPError, e:
@@ -602,16 +604,20 @@ def write_sourceslist(jinja_env, cfg, outdir):
 
     repos = {}
     for release in cfg.options('release codenames'):
+        if release == 'data':
+            # no seperate list for the data archive
+            continue
         transrel = trans_codename(release, cfg)
         repos[transrel] = []
         for mirror in cfg.options('mirrors'):
             listname = 'neurodebian.%s.%s.sources.list' % (release, mirror)
             repos[transrel].append((mirror, listname))
             lf = open(os.path.join(outdir, '_static', listname), 'w')
-            aptcfg = '%s %s main contrib non-free\n' % (cfg.get('mirrors', mirror),
-                                                      release)
-            lf.write('deb %s' % aptcfg)
-            lf.write('deb-src %s' % aptcfg)
+            for rel in ('data', release):
+                aptcfg = '%s %s main contrib non-free\n' % (cfg.get('mirrors', mirror),
+                                                          rel)
+                lf.write('deb %s' % aptcfg)
+                lf.write('#deb-src %s' % aptcfg)
             lf.close()
 
     srclist_template = jinja_env.get_template('sources_lists.rst')