diff options
Diffstat (limited to 'UpdateManager/Common')
| -rw-r--r-- | UpdateManager/Common/DistInfo.py | 19 | ||||
| -rw-r--r-- | UpdateManager/Common/aptsources.py | 51 |
2 files changed, 11 insertions, 59 deletions
diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index 81f08200..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) @@ -100,6 +99,13 @@ class DistInfo: for nanny in self.suites: if nanny.name == value: nanny.children.append(suite) + # reuse some properties of the parent suite + if suite.match_uri == None: + suite.match_uri = nanny.match_uri + if suite.valid_mirrors == None: + suite.valid_mirrors = nanny.valid_mirrors + if suite.base_uri == None: + suite.base_uri = nanny.base_uri elif field == 'Available': suite.available = value elif field == 'RepositoryType': @@ -120,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': @@ -133,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) @@ -152,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/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index bc6886d9..81b65cfa 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -87,7 +87,6 @@ class SourceEntry: file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist") self.file = file # the file that the entry is located in self.parse(line) - # FIXME: this name is really misleading and already overloaded self.template = None # type DistInfo.Suite self.children = [] @@ -373,56 +372,6 @@ class SourcesList: #print self.parents return (parents, used_child_templates) -# templates for the add dialog -class SourceEntryTemplate(SourceEntry): - def __init__(self,a_type,uri,dist,description,comps): - self.comps_descriptions = [] - self.type = a_type - self.uri = uri - self.dist = dist - self.description = description - self.comps = comps - - def matches(self,source_entry): - """ check if a given source_entry matches this one """ - if (self.type != source_entry.type): - return False - if (self.dist != source_entry.dist): - return False - if not is_mirror(self.uri,source_entry.uri): - return False - for e_comp in source_entry.comps: - for t_comp in self.comps: - if e_comp == t_comp.name: break - else: - return False - return True - -class SourceCompTemplate: - def __init__(self, name, description, on_by_default): - self.name = name - self.description = description - self.on_by_default = on_by_default - -class SourceEntryTemplates: - - def __init__(self,datadir): - _ = gettext.gettext - self.templates = [] - - dinfo = DistInfo (base_dir=datadir+"channels/") - - for suite in dinfo.suites: - comps = [] - for comp in suite.components: - comps.append(SourceCompTemplate(comp.name, _(comp.description), - comp.enabled)) - self.templates.append (SourceEntryTemplate(suite.repository_type, - suite.base_uri, - suite.name, - suite.description, - comps)) - # matcher class to make a source entry look nice # lots of predefined matchers to make it i18n/gettext friendly class SourceEntryMatcher: |