summaryrefslogtreecommitdiff
path: root/DistUpgrade/DistUpgradeControler.py
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-04-28 18:08:49 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-04-28 18:08:49 +0200
commit44f04eb81fa2fefaa766baa919cacd5dc90f5641 (patch)
tree5b683327e387e1d2fb5c576d106b7dd2fe4835eb /DistUpgrade/DistUpgradeControler.py
parent34eb7395b42df46fe9caf53d107d212e39a7cdf8 (diff)
downloadpython-apt-44f04eb81fa2fefaa766baa919cacd5dc90f5641.tar.gz
* DistUpgrade/Changelog: updated
* DistUpgrade/DistUpgradeControler.py: some FIXMEs added * DistUpgrade/DistUpgradeViewGtk.py: - dont report dpkg timeouts (no activity on terinal) over and over again
Diffstat (limited to 'DistUpgrade/DistUpgradeControler.py')
-rw-r--r--DistUpgrade/DistUpgradeControler.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index c486a407..c89f6a34 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -149,7 +149,9 @@ class DistUpgradeControler(object):
"will cancel.") % (self.fromDist, self.toDist)
if not self._view.askYesNoQuestion(prim, secon):
self.abort()
- # add some defaults
+
+ # add some defaults here
+ # FIXME: find mirror here
uri = "http://archive.ubuntu.com/ubuntu"
comps = ["main","restricted"]
self.sources.add("deb", uri, self.toDist, comps)
@@ -389,6 +391,10 @@ class DistUpgradeControler(object):
# if not something went seriously wrong
for pkg in self.config.getlist("Distro","BaseMetaPkgs"):
if not self.cache.has_key(pkg):
+ # FIXME: we could offer to add default source entries here,
+ # but we need to be careful to not duplicate them
+ # (i.e. the error here could be something else than
+ # missing sources entires but network errors etc)
logging.error("No '%s' after sources.list rewrite+update")
self._view.error(_("Inavlid package information"),
_("After your package information was "