summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DistUpgrade/Changelog4
-rw-r--r--DistUpgrade/DistUpgradeControler.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index 49c745fd..60deabfa 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,3 +1,7 @@
+2006-05-24:
+ - if the initial "update()" fails, just exit, don't try
+ to restore the old sources.list (nothing was modified yet)
+ Ubuntu: #46712
2006-05-12:
- space checking improved (ubuntu: #43948)
- show software that was demoted from main -> universe
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 1bfde361..44185116 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -437,7 +437,7 @@ class DistUpgradeControler(object):
# run a "apt-get update" now
if not self.doUpdate():
- self.abort()
+ sys.exit(1)
# do pre-upgrade stuff (calc list of obsolete pkgs etc)
self.doPreUpdate()