summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglatzor@ubuntu.com <>2006-06-29 00:52:16 +0200
committerglatzor@ubuntu.com <>2006-06-29 00:52:16 +0200
commit34bb7b2d05692dbaab36dbad43d4b4305e0ff905 (patch)
treed28cfbd46b2115b1cb3cebc4870d15f014e3f107
parentf100900ea0709a71ebceae238f0b60fe28aa9232 (diff)
downloadpython-apt-34bb7b2d05692dbaab36dbad43d4b4305e0ff905.tar.gz
* fixed test output of DistInfo and channels desc for Ubuntu
-rw-r--r--SoftwareProperties/SoftwareProperties.py5
-rw-r--r--UpdateManager/Common/DistInfo.py6
2 files changed, 8 insertions, 3 deletions
diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 037f01fb..e0d5f524 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -56,6 +56,11 @@ CONF_MAP = {
"max_age" : "APT::Archives::MaxAge"
}
+(
+COLUMN_ACTIVE,
+COLUMN_DESC
+) = range(2)
+
# columns of the source_store
(SORE_ACTIVE, STORE_DESCRIPTION, STORE_SOURCE, STORE_SEPARATOR) = range(4)
diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py
index 873d7132..ebf83516 100644
--- a/UpdateManager/Common/DistInfo.py
+++ b/UpdateManager/Common/DistInfo.py
@@ -135,8 +135,8 @@ if __name__ == "__main__":
print "BaseURI: %s" % suite.base_uri
print "MatchURI: %s" % suite.match_uri
for component in suite.components:
- print " %s - %s - %s " % (component.name,
- component.description,
- component.enabled)
+ print " %s - %s - %s " % (component,
+ suite.components[component][0],
+ suite.components[component][1])
for child in suite.children:
print " %s" % child.description