[cpl-plugin-xsh] 04/06: Merge branch 'debian-template' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-xsh.

commit 05c8bdc5a1a8a609fa44c0596b95376b78f35551
Merge: 5035955 4ae49e8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 27 16:52:55 2013 +0100

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/create_sphinx.py

 debian/create_manpage.py |  2 +-
 debian/create_sphinx.py  | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --cc debian/create_sphinx.py
index 052a406,be553f9..3536141
--- a/debian/create_sphinx.py
+++ b/debian/create_sphinx.py
@@@ -137,14 -137,12 +137,13 @@@ pipeline = sys.argv[1
  cpl.Recipe.path = "recipes"
  recipes = [ cpl.Recipe(name) for name, version in cpl.Recipe.list() ]
  oca = file(os.path.join("calib", "gasgano", "config", pipeline + ".oca")).read()
+ oca = oca[oca.find("action"):]
  recipes_oca = [recipe for recipe in recipes if recipe.__name__ in oca]
- 
- r_index = dict( (recipe, oca.index(recipe.__name__)) for recipe in recipes_oca)
- recipes_oca.sort(key = lambda recipe: r_index[recipe])
- del r_index
+ index = [ oca.find(recipe.__name__) for recipe in recipes_oca ]
+ recipes_oca = [r for (i, r) in sorted(zip(index, recipes_oca))]
  
  recipes_x = [recipe for recipe in recipes if not recipe.__name__ in oca]
 +recipes_x.sort(key = lambda recipe: recipe.__name__)
  
  def par(recipe, template, delimiter = "", count = None):
      return delimiter.join(template.format(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-xsh.git