diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-04 22:49:31 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-04 22:49:31 +0200 |
| commit | 36aaf7a6e85328bad2e330ddb2d0f12554602f4f (patch) | |
| tree | 69e1f9c4ddfca6d3fe1fbfb3ddc7cc04666359be /UpdateManager | |
| parent | 57397ade71171c8ac03aa1de592ba67b50d1db87 (diff) | |
| parent | dd6de6768890b0aaf21ceac12f835f9157e438a9 (diff) | |
| download | python-apt-36aaf7a6e85328bad2e330ddb2d0f12554602f4f.tar.gz | |
* merged from Sebastian
Diffstat (limited to 'UpdateManager')
| -rw-r--r-- | UpdateManager/Common/aptsources.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index 38b1bd92..1fa080da 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) |