[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-598-gace668e

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 0b250e7c14891e54950d444058eb38d1ac6cfdc4
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu Jan 12 21:07:12 2012 +0100

    replace depends_with_alts() with all_dependencies()
    
    only the names of the dependencies are needed,
    not the complete parsed entries
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index 0d761c6..9f1b066 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -97,19 +97,12 @@ class Package(UserDict.UserDict):
                 vlist += self._parse_alternative_dependencies(header)
         return vlist
 
-    def depends_with_alts(self, header_name):
-        vlist = []
-        if header_name in self:
-            parser = DependencyParser(self[header_name])
-            vlist += parser.get_dependencies()
-        return vlist
-
     def prefer_alt_depends(self, header_name,dep_idx,dep):
         if header_name in self:
             if header_name not in self._parsed_deps:
                   self._parse_dependencies(header_name)
             if self._parsed_deps[header_name][dep_idx]:
-                self._parsed_deps[header_name][dep_idx] = dep.name
+                self._parsed_deps[header_name][dep_idx] = dep
 
     def provides(self):
         vlist = []
@@ -341,7 +334,7 @@ class PackagesDB:
 
         state = None
         for header in ["Depends", "Pre-Depends"]:
-            alt_deps=package.depends_with_alts(header)
+            alt_deps = package.all_dependencies(header)
             for d in range(len(alt_deps)):
                 if len(alt_deps[d]) > 1:
                     alt_found = 0
@@ -352,8 +345,7 @@ class PackagesDB:
                     prefer_alt_idx = 0
                     prefer_alt = None
                     for alternative in alt_deps[d]:
-                        dep = alternative.name
-                        altdep_state = self.get_package_state(dep)
+                        altdep_state = self.get_package_state(alternative)
                         if altdep_state != "does-not-exist":
                             alt_found += 1
                             if prefer_alt_score < 3 and altdep_state == "essential-required":

-- 
piuparts git repository