summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-13 14:36:58 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-13 14:36:58 +0100
commit71aad7e28bbaf1ee8efdad77ebfb4e4c0fd0ec26 (patch)
tree4db1908b3d8d4896d39b7788488f2bfb141e138f /doc
parent469ac5b1a7c069d3822bd36cb74958ce3de19c87 (diff)
parent1da29f8e4e578e00e5703a7db7dc8e8d3c7a08bd (diff)
downloadpython-apt-71aad7e28bbaf1ee8efdad77ebfb4e4c0fd0ec26.tar.gz
* apt/progress/__init__.py:
- Fix InstallProgress.updateInterface() to cope with read() returning 0 on non-blocking file descriptors (LP: #491027). * apt/cache.py: - improved docstring for the cache - add "enhances" property * data/templates/Ubuntu.info.in: - add lucid * python/cache.cc: - add UntranslatedDepType attribute to DependencyType - add DepTypeEnum that returns a value from {DepDepends, DepPreDepends, ...} * python/apt_pkgmodule.cc: - add DepDpkgBreaks, DepEnhances constants * doc/source/apt_pkg/{cache.rst, index.rst}: - update documentation as well
Diffstat (limited to 'doc')
-rw-r--r--doc/source/apt_pkg/cache.rst9
-rw-r--r--doc/source/apt_pkg/index.rst5
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/source/apt_pkg/cache.rst b/doc/source/apt_pkg/cache.rst
index 334b7869..ca9f8b49 100644
--- a/doc/source/apt_pkg/cache.rst
+++ b/doc/source/apt_pkg/cache.rst
@@ -596,8 +596,17 @@ Example:
.. attribute:: DepType
+ The type of the dependency, as translated string, eg. "Depends".
+
+ .. attribute:: UntranslatedDepType
+
The type of the dependency, as string, eg. "Depends".
+ .. attribute:: DepTypeEnum
+
+ The type of the dependency, as integer that matches a value
+ of :ref:`Dependency types <DependencyTypes>`.
+
.. attribute:: ID
The ID of the package, as integer.
diff --git a/doc/source/apt_pkg/index.rst b/doc/source/apt_pkg/index.rst
index 6e7b772e..4256d971 100644
--- a/doc/source/apt_pkg/index.rst
+++ b/doc/source/apt_pkg/index.rst
@@ -329,19 +329,22 @@ Package States
.. data:: CurStateNotInstalled
.. data:: CurStateUnPacked
-
+.. _DependencyTypes:
Dependency types
^^^^^^^^^^^^^^^^
.. data:: DepConflicts
.. data:: DepDepends
+.. data:: DepDpkgBreaks
+.. data:: DepEnhances
.. data:: DepObsoletes
.. data:: DepPreDepends
.. data:: DepRecommends
.. data:: DepReplaces
.. data:: DepSuggests
+
.. _InstStates:
Installed states