* erged from michael

19 files changed, 32 insertions, 18 deletions

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 71762d6e..9ba1a04c 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -28,6 +28,7 @@ import vte
 import gobject
 import pango
 import sys
+import logging
 
 import apt
 import apt_pkg
@@ -140,6 +141,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         msg="<big><b>%s</b></big>\n\n%s" % (summary, msg)
         self.label_error.set_markup(msg)
 
+        logging.error("got a error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg))
         if errormsg != None:
             buffer = self.textview_error.get_buffer()
             buffer.set_text(errormsg)
@@ -150,6 +152,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         return False
                       
     def conffile(self, current, new):
+        logging.debug("got a conffile-prompt from dpkg for pkg: '%s'" % current)
         self.expander.set_expanded(True)
         pass
     def fork(self):
diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO
index fa31c041..9d26eefc 100644
--- a/DistUpgrade/TODO
+++ b/DistUpgrade/TODO
@@ -32,4 +32,14 @@ Robustness:
   DescURI for each failed item and guess from it what sources.list
   line failed (e.g. uri.endswith("Sources{.bz2|.gz") -> deb-src, get
   base-uri, find 'dists' in uri etc)
-  
\ No newline at end of file
+  
+- don't stop if a single pkg fails to upgrade:
+  - the problem here is apt, in apt-pkg/deb/dpkgpm.cc it will stop if
+    dpkg returns a non-zero exit code. The problem with this is of course
+    that this may happen in the middle of the upgrade, leaving half the
+    packages unpacked but not configured or loads of packages unconfigured.
+    One possible solution is to not stop in apt but try to continue as long
+    as possible. The problem here is that e.g. if libnoitfy0 explodes and
+    evolution, update-notifer depend on it, continuing means to evo and u-n
+    can't be upgraded and dpkg explodes on them too. This is not more worse
+    than what we have right now I guess.
\ No newline at end of file
diff --git a/data/gnome-software-properties.desktop.in b/data/gnome-software-properties.desktop.in
index 93f206cd..ef1547c4 100644
--- a/data/gnome-software-properties.desktop.in
+++ b/data/gnome-software-properties.desktop.in
@@ -9,3 +9,4 @@ MultipleArgs=false
 Type=Application
 Encoding=UTF-8
 Categories=Application;System;Settings;
+X-KDE-SubstituteUID=true
diff --git a/po/da.po b/po/da.po
index 1d572fd3..23a971d8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-28 11:31+0200\n"
 "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index ddcdb334..d9ab6c24 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-04-02 08:46+0200\n"
 "Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n"
 "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
@@ -575,7 +575,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:3
 msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
-msgstr "Ubuntu wird aktualisiert"
+msgstr "<span weight=\"bold\" size=\"x-large\">Ubuntu wird aktualisiert</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:4
 msgid "Cleaning up"
diff --git a/po/el.po b/po/el.po
index eb4cf06d..913da3d5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-05 14:33+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index c6fe9e1d..576479d4 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-04-03 01:26-0500\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
diff --git a/po/es.po b/po/es.po
index 97335902..12fa89b4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-04-04 15:00+0200\n"
 "Last-Translator: Jorge Bernal <koke@amedias.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 964a40be..c3f4dd6f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-30 08:30+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 5e87470b..414b81fd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.37.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-04-04 19:43+0200\n"
 "Last-Translator: \n"
 "Language-Team: French <gnomefr@traduc.org>\n"
diff --git a/po/hu.po b/po/hu.po
index 6136343a..fa4b63a9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-04-03 12:32+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
diff --git a/po/ja.po b/po/ja.po
index 2e9c9999..61db8d6f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-10-12 17:28+0900\n"
 "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
 "Language-Team: Ubuntu-ja <ubuntu-ja-users@freeml.com>\n"
diff --git a/po/pl.po b/po/pl.po
index 83047bcf..429d2e21 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-25 17:23+0100\n"
 "Last-Translator: Zygmunt Krynicki <zyga@www.suxx.pl>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5a0195e7..7be44cb1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-29 13:36-0300\n"
 "Last-Translator: Raphael Higino <raphaelh@uai.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-status@listas.cipsga.org."
diff --git a/po/ro.po b/po/ro.po
index 7c922c32..0a3f1dcd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-03 19:28+0200\n"
 "Last-Translator: Dan Damian <dand@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
diff --git a/po/rw.po b/po/rw.po
index 95087049..131fb9ff 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
diff --git a/po/sv.po b/po/sv.po
index 805e9ebc..b709124a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-26 15:14+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/xh.po b/po/xh.po
index 674393aa..300825c0 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-30 13:25+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c592a475..60d184fd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 12:41+0100\n"
+"POT-Creation-Date: 2006-01-25 12:45+0100\n"
 "PO-Revision-Date: 2005-03-21 22:00+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"