merged from the mvo branch

3 files changed, 31 insertions, 3 deletions

diff --git a/apt/package.py b/apt/package.py
index 308bd223..8d44ef02 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -67,11 +67,12 @@ class BaseDependency(object):
         preDepend - Boolean value whether this is a pre-dependency.
     """
 
-    def __init__(self, name, rel, ver, pre):
+    def __init__(self, name, rel, ver, pre, recommends=False):
         self.name = name
         self.relation = rel
         self.version = ver
         self.preDepend = pre
+        self.recommends = recommends
 
     def __repr__(self):
         return ('<BaseDependency: name:%r relation:%r version:%r preDepend:%r>'
@@ -378,6 +379,23 @@ class Version(object):
         return depends_list
 
     @property
+    def recommends(self):
+        """Return the recommends of the package version."""
+        recommends_list = []
+        depends = self._cand.DependsList
+        try:
+            for depVerList in depends["Recommends"]:
+                base_recs = []
+                for depOr in depVerList:
+                    base_recs.append(BaseDependency(depOr.TargetPkg.Name,
+                                                    depOr.CompType, 
+                                                    False, True))
+                recommends_list.append(Dependency(base_recs))
+        except KeyError:
+            pass
+        return recommends_list
+
+    @property
     def origins(self):
         """Return a list of origins for the package version."""
         origins = []
@@ -1096,6 +1114,7 @@ def _test():
     print "InstalledSize: %s " % pkg.candidate.installed_size
     print "PackageSize: %s " % pkg.candidate.size
     print "Dependencies: %s" % pkg.installed.dependencies
+    print "Recommends: %s" % pkg.installed.recommends
     for dep in pkg.candidate.dependencies:
         print ",".join("%s (%s) (%s) (%s)" % (o.name, o.version, o.relation,
                         o.preDepend) for o in dep.or_dependencies)
diff --git a/debian/changelog b/debian/changelog
index 6e952afa..8baf39f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-apt (0.7.12.2) unstable; urgency=low
+
+  * apt/package.py:
+    - add "recommends" property
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Aug 2009 11:13:17 +0200
+
 python-apt (0.7.12.1) unstable; urgency=low
 
   * apt/debfile.py:
diff --git a/python/progress.cc b/python/progress.cc
index 94debe40..b3e06b87 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -72,8 +72,10 @@ void PyOpProgress::Update()
    PyObject_SetAttrString(callbackInst, "majorChange", o);
    Py_XDECREF(o);
 
-   // Build up the argument list...
-   if(CheckChange(0.05))
+   // CheckChange takes a time delta argument how often we
+   // should run update - for interactive UIs it makes sense
+   // to run ~25/sec
+   if(CheckChange(0.04))
    {
       PyObject *arglist = Py_BuildValue("(f)", Percent);
       RunSimpleCallback("update", arglist);