summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2014-01-06 16:08:05 +0100
committerJulian Andres Klode <jak@debian.org>2014-01-06 16:09:43 +0100
commit1ef0777d668a6bde0eb592928996a08570864c3f (patch)
tree856e409721ba74993320e090294801a1b83cd6ab
parent38804bc141cf98a0d3538bde692660de2de3b037 (diff)
downloadpython-apt-1ef0777d668a6bde0eb592928996a08570864c3f.tar.gz
Unify list of comparison type values everywhere
They are now ordered and include the != and < operators in all cases.
-rw-r--r--apt/package.py2
-rw-r--r--doc/source/library/apt.package.rst3
-rw-r--r--doc/source/library/apt_pkg.rst3
-rw-r--r--python/cache.cc3
4 files changed, 7 insertions, 4 deletions
diff --git a/apt/package.py b/apt/package.py
index efe4d83e..78b10af4 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -65,7 +65,7 @@ class BaseDependency(object):
Attributes defined here:
name - The name of the dependency
- relation - The relation (>,>=,=,!=,<,<=,)
+ relation - The relation (<,<=,=,!=,>=,>,)
version - The version depended on
rawtype - The type of the dependendy (e.g. 'Recommends')
pre_depend - Boolean value whether this is a pre-dependency.
diff --git a/doc/source/library/apt.package.rst b/doc/source/library/apt.package.rst
index 317e859f..825bf3df 100644
--- a/doc/source/library/apt.package.rst
+++ b/doc/source/library/apt.package.rst
@@ -34,7 +34,8 @@ Dependency Information
.. attribute:: relation
- The relation (>,>=,=,!=,<,<=,)
+ The relation (<,<=,=,!=,>=,>,), as string. Note that the empty string
+ is a valid string as well, if no version is specified.
.. attribute:: version
diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst
index d9b8ae80..d6ffaf4c 100644
--- a/doc/source/library/apt_pkg.rst
+++ b/doc/source/library/apt_pkg.rst
@@ -1022,7 +1022,8 @@ Example:
.. attribute:: comp_type
- The type of comparison (>=, =, !=, >, <=), as string.
+ The type of comparison (<,<=,=,!=,>=,>,), as string. Note that the
+ empty string is a valid string as well, if no version is specified.
.. attribute:: dep_type
diff --git a/python/cache.cc b/python/cache.cc
index 983b56ec..c0f1eded 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -1457,7 +1457,8 @@ static PyObject *DependencyGetID(PyObject *Self,void*)
static PyGetSetDef DependencyGetSet[] = {
{"comp_type",DependencyGetCompType,0,
- "The type of comparison, as a string (one of '<', '<=', '=', '>=', '>')."},
+ "The type of comparison, as a string, namely one of:\n"
+ "'<', '<=', '=', '!=', '>=', '>', ''."},
{"dep_type",DependencyGetDepType,0,
"The type of the dependency; may be translated"},
{"dep_type_untranslated",DependencyGetDepTypeUntranslated,0,