summaryrefslogtreecommitdiff
path: root/DistUpgrade
diff options
context:
space:
mode:
Diffstat (limited to 'DistUpgrade')
-rw-r--r--DistUpgrade/DistUpgrade.cfg3
-rw-r--r--DistUpgrade/DistUpgradeViewNonInteractive.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg
index cf97d16f..fdc70150 100644
--- a/DistUpgrade/DistUpgrade.cfg
+++ b/DistUpgrade/DistUpgrade.cfg
@@ -15,6 +15,7 @@ ForcedObsoletes=xscreensaver
[kubuntu-desktop]
KeyDependencies=kdm, kicker, kubuntu-artwork-usplash
+ForcedObsoletes=ivman
[edubuntu-desktop]
KeyDependencies=edubuntu-artwork, tuxpaint
@@ -30,4 +31,4 @@ BackupExt=distUpgrade
From=breezy
To=dapper
ValidOrigin=Ubuntu
-ValidMirrors = http://archive.ubuntu.com/ubuntu, http://security.ubuntu.com/ubuntu, http://archive.distrosprint/ubuntu/ \ No newline at end of file
+ValidMirrors = http://archive.ubuntu.com/ubuntu, http://security.ubuntu.com/ubuntu, http://archive.distrosprint/ubuntu/
diff --git a/DistUpgrade/DistUpgradeViewNonInteractive.py b/DistUpgrade/DistUpgradeViewNonInteractive.py
index e8236565..07eea2ac 100644
--- a/DistUpgrade/DistUpgradeViewNonInteractive.py
+++ b/DistUpgrade/DistUpgradeViewNonInteractive.py
@@ -71,5 +71,5 @@ class NonInteractiveDistUpgradeView(object):
return False
def error(self, summary, msg, extended_msg=None):
" display a error "
- logging.error("%s %s (%s)" % (summary, msg, extended_msg)
+ logging.error("%s %s (%s)" % (summary, msg, extended_msg))