summaryrefslogtreecommitdiff
path: root/DistUpgrade
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-05-26 14:24:16 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-05-26 14:24:16 +0200
commit9d81b5e8a3627aa67a513f17c0f546f77a93eabf (patch)
tree6ca0b2527ba48a4f378e9405fe886b93510848c9 /DistUpgrade
parent553330ac3391dd3647dac961d7653179a11c55e3 (diff)
downloadpython-apt-9d81b5e8a3627aa67a513f17c0f546f77a93eabf.tar.gz
* DistUpgrade/DistUpgradeControler.py:
- exit if the initial cache.update() fails
Diffstat (limited to 'DistUpgrade')
-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()