diff options
| author | glatzor@ubuntu.com <> | 2006-09-12 15:18:43 +0200 |
|---|---|---|
| committer | glatzor@ubuntu.com <> | 2006-09-12 15:18:43 +0200 |
| commit | 659868a2c75856e1bb51ceb2e8ebee52e6f3d820 (patch) | |
| tree | 2abc7bae3b79e4a4633555e13f01530fe90c5a21 | |
| parent | 9204b32c986dabe44ae755f5a665314187891c42 (diff) | |
| download | python-apt-659868a2c75856e1bb51ceb2e8ebee52e6f3d820.tar.gz | |
* Remove the obsolete Enabled property completely from the code
| -rw-r--r-- | SoftwareProperties/SoftwareProperties.py | 4 | ||||
| -rw-r--r-- | UpdateManager/Common/DistInfo.py | 12 | ||||
| -rw-r--r-- | data/channels/README.channels | 5 |
3 files changed, 8 insertions, 13 deletions
diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index a18fec20..f2a2cc19 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -261,7 +261,7 @@ class SoftwareProperties(SimpleGladeApp): # TRANSLATORS: Label for the components in the Internet section # first %s is the description of the component # second %s is the code name of the comp, eg main, universe - label = _("%s (%s)") % (self.distro.source_template.components[comp][2], + label = _("%s (%s)") % (self.distro.source_template.components[comp][1], comp) checkbox = gtk.CheckButton(label) # check if the comp is enabled @@ -721,7 +721,7 @@ class SoftwareProperties(SimpleGladeApp): for comp in source.comps: if source.template.components.has_key(comp): print source.template.components[comp] - (desc, enabled, desc_long) = source.template.components[comp] + (desc, desc_long) = source.template.components[comp] contents += "\n%s" % desc else: contents += "\n%s" % comp diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index d509cd9e..83603ed9 100644 --- a/UpdateManager/Common/DistInfo.py +++ b/UpdateManager/Common/DistInfo.py @@ -48,7 +48,6 @@ class Component: self.name = "" self.description = "" self.description_long = "" - self.enabled = None class DistInfo: def __init__(self, @@ -85,7 +84,7 @@ class DistInfo: if suite: if component: suite.components["%s" % component.name] = \ - (component.description, component.enabled, + (component.description, component.description_long) component = None self.suites.append (suite) @@ -127,12 +126,10 @@ class DistInfo: elif field == 'Component': if component: suite.components["%s" % component.name] = \ - (component.description, component.enabled, + (component.description, component.description_long) component = Component () component.name = value - elif field == 'Enabled': - component.enabled = bool(int(value)) elif field == 'CompDescription': component.description = _(value) elif field == 'CompDescriptionLong': @@ -140,7 +137,7 @@ class DistInfo: if suite: if component: suite.components["%s" % component.name] = \ - (component.description, component.enabled, + (component.description, component.description_long) component = None self.suites.append (suite) @@ -159,7 +156,6 @@ if __name__ == "__main__": for component in suite.components: print " %s - %s - %s - %s" % (component, suite.components[component][0], - suite.components[component][1], - suite.components[component][2]) + suite.components[component][1]) for child in suite.children: print " %s" % child.description diff --git a/data/channels/README.channels b/data/channels/README.channels index 6bc76872..414148ed 100644 --- a/data/channels/README.channels +++ b/data/channels/README.channels @@ -37,11 +37,10 @@ Description: description of the suite. the translation is done through Component: a component/section of the suite (ignored if ParentSuite is set) -Enabled: activate the component by default (ignored if ParentSuite is - set) - CompDescription: humand readable description of the component/section (ignored if ParentSuite is set). the translation is done through gettext at runtime +ValidMirros: A file that contains a list of mirrors + |