From dd6de6768890b0aaf21ceac12f835f9157e438a9 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Sat, 2 Sep 2006 13:34:15 +0200 Subject: * Fix #58453: handle disabled child sources correctly --- UpdateManager/Common/aptsources.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'UpdateManager') diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index 80781cb0..1554ad61 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -537,12 +537,15 @@ class Distribution: self.source_code_sources.append(source) elif source.type.endswith("-src") and source.disabled == True: self.disabled_sources.append(source) - if source.template in self.source_template.children: - #print "yeah! child found: %s" % source.template.name - if source.type == "deb": + if source.invalid == False and\ + source.template in self.source_template.children: + if source.disabled == False and source.type == "deb": self.child_sources.append(source) - elif source.type == "deb-src": + elif source.disabled == False and source.type == "deb-src": self.source_code_sources.append(source) + else: + self.disabled_sources.append(source) + self.download_comps = set(comps) self.cdrom_comps = set(cdrom_comps) enabled_comps.extend(comps) -- cgit v1.2.3