[Checkins] SVN: z3c.recipe.depgraph/trunk/ Do not break if the ``eggs`` option in the buildout file contains extras.

[Fabio Tranchitella]

Log message for revision 106831:
  Do not break if the ``eggs`` option in the buildout file contains extras.
  

Changed:
  U   z3c.recipe.depgraph/trunk/CHANGES.txt
  U   z3c.recipe.depgraph/trunk/src/z3c/recipe/depgraph/recipe.py
  U   z3c.recipe.depgraph/trunk/src/z3c/recipe/depgraph/runner.py

-=-
Modified: z3c.recipe.depgraph/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.depgraph/trunk/CHANGES.txt	2009-12-21 20:13:09 UTC (rev 106830)
+++ z3c.recipe.depgraph/trunk/CHANGES.txt	2009-12-21 20:30:03 UTC (rev 106831)
@@ -3,6 +3,7 @@
 
 0.5 (unreleased)
 ----------------
+- Do not break if the ``eggs`` option in the buildout file contains extras.
 
 0.4 (2009-10-04)
 ----------------

Modified: z3c.recipe.depgraph/trunk/src/z3c/recipe/depgraph/recipe.py
===================================================================
--- z3c.recipe.depgraph/trunk/src/z3c/recipe/depgraph/recipe.py	2009-12-21 20:13:09 UTC (rev 106830)
+++ z3c.recipe.depgraph/trunk/src/z3c/recipe/depgraph/recipe.py	2009-12-21 20:30:03 UTC (rev 106831)
@@ -22,7 +22,7 @@
         self.name = name
         self.options = options
         self.egg = Egg(buildout, options['recipe'], options)
-        self.eggs = self.options.get('eggs', '').split()
+        self.eggs = self.options.get('eggs', '').split('\n')
         self.strict = self.options.get('strict', '').lower() in ('1', 'true', 'yes')
 
         exclude = self.options.get('exclude', '')

Modified: z3c.recipe.depgraph/trunk/src/z3c/recipe/depgraph/runner.py
===================================================================
--- z3c.recipe.depgraph/trunk/src/z3c/recipe/depgraph/runner.py	2009-12-21 20:13:09 UTC (rev 106830)
+++ z3c.recipe.depgraph/trunk/src/z3c/recipe/depgraph/runner.py	2009-12-21 20:30:03 UTC (rev 106831)
@@ -1,6 +1,6 @@
 import os
 
-GENERATE = "./bin/%(scriptname)s %(exclude)s %(re_exclude)s %(dead_ends)s %(re_dead_ends)s %(extras)s-d %(package)s -i setuptools > %(output)s"
+GENERATE = "./bin/%(scriptname)s %(exclude)s %(re_exclude)s %(dead_ends)s %(re_dead_ends)s %(extras)s-d \"%(package)s\" -i setuptools > %(output)s"
 TRED = "tred %(input)s > %(output)s"
 GRAPH = "dot -T%(format)s %(input)s > %(output)s"
 SCCMAP = "sccmap %(input)s > %(output)s"
@@ -33,7 +33,7 @@
     re_dead_ends = build_option('-E', args.get('re_dead_ends'))
 
     for package in packages:
-        name = package
+        name = package.split('[', 1)[0].strip()
         if name in package_map:
             name = package_map[name]
         deeppath = os.path.join(path, name.replace('.', os.sep))