From e829a5822f25e957fa837ef52868508eb3c7505e Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.net>
Date: Mon, 15 Sep 2008 08:43:06 +0200
Subject: New dependency handling. Should fix some bugs.

---
 portato/backend/package.py | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

(limited to 'portato/backend/package.py')

diff --git a/portato/backend/package.py b/portato/backend/package.py
index e4b2082..c9f87ac 100644
--- a/portato/backend/package.py
+++ b/portato/backend/package.py
@@ -180,34 +180,8 @@ class Package (_Package):
         deps = paren_reduce(deps)
         
         tree = DependencyTree()
+        tree.parse(deps)
 
-        def add (tree, deps):
-            it = iter(deps)
-            for dep in it:
-                if hasattr(dep, "__iter__"):
-                    debug("Following dep is an unsupposed list: %s", dep)
-                    assert(len(dep) == 1)
-                    dep = dep[0]
-                if dep.endswith("?"):
-                    ntree = tree.add_flag(dep[:-1])
-                    n = it.next()
-                    if not hasattr(n, "__iter__"):
-                        n = (n,)
-                    add(ntree, n)
-                
-                elif dep == "||":    
-                    n = it.next() # skip
-                    if not hasattr(n, "__iter__"):
-                        n = [n]
-                    else:
-                        n = list(n)
-
-                    tree.add_or(n)
-                
-                else:
-                    tree.add(dep)
-
-        add(tree, deps)
         return tree
 
     #
-- 
cgit v1.2.3-54-g00ecf