Merge lp:~barry/computer-janitor/545306-dialog into lp:computer-janitor

[Barry Warsaw]

Might as well walk the walk and get this code reviewed before I merge it into trunk.

This fixes bug 545306 so that a dialog is displayed in the gtk version when another package manager such as Synaptic is running. This instead of crashing or (just) printing a traceback to the log file.

[Barry Warsaw (barry)]

review: Approve

=== modified file 'computerjanitorapp/__init__.py'
--- computerjanitorapp/__init__.py	2010-02-09 21:24:21 +0000
+++ computerjanitorapp/__init__.py	2010-05-20 13:55:46 +0000
@@ -23,7 +23,7 @@
     ]
 
 
-__version__ = '2.0'
+__version__ = '2.0.1'
 
 
 # Set up gettext.

=== renamed file 'computerjanitorapp/gtk/areyousure.py' => 'computerjanitorapp/gtk/dialogs.py'
--- computerjanitorapp/gtk/areyousure.py	2010-04-15 16:09:46 +0000
+++ computerjanitorapp/gtk/dialogs.py	2010-05-20 13:55:46 +0000
@@ -19,6 +19,7 @@
 __metaclass__ = type
 __all__ = [
     'AreYouSure',
+    'CleanupProblem',
     ]
 
 
@@ -31,12 +32,16 @@
 NL = '\n'
 
 
-class AreYouSure:
-    """Confirmation of destructive actions."""
+class DialogBase:
+    """Base class for dialogs."""
 
     def __init__(self, ui):
         self._ui = ui
 
+
+class AreYouSure(DialogBase):
+    """Confirmation of destructive actions."""
+
     def verify(self):
         """Confirm package removal."""
         # Start by getting all the active, non-ignored cruft.  These are the
@@ -77,3 +82,26 @@
         response = dialog.run()
         dialog.hide()
         return response == gtk.RESPONSE_YES
+
+
+class CleanupProblem(DialogBase):
+    """Some problem occurred during cleanup.
+
+    This is almost definitely caused by another package manager running at the
+    same time.
+    """
+
+    def run(self):
+        """Show the dialog and wait for confirmation."""
+        message = _('System clean up could not complete. '
+                    'Be sure no other package manager such as Synaptic or '
+                    'Update Manager is running.')
+        dialog = gtk.MessageDialog(
+            parent=self._ui.widgets['window'],
+            type=gtk.MESSAGE_ERROR,
+            buttons=gtk.BUTTONS_OK,
+            message_format=message)
+        dialog.set_title(_('System clean up failure'))
+        dialog.show_all()
+        dialog.run()
+        dialog.hide()

=== modified file 'computerjanitorapp/gtk/ui.py'
--- computerjanitorapp/gtk/ui.py	2010-04-15 16:09:46 +0000
+++ computerjanitorapp/gtk/ui.py	2010-05-20 13:55:46 +0000
@@ -24,13 +24,14 @@
 
 import os
 import gtk
+import sys
 import dbus
 import glib
 import pango
 import gobject
 
 from computerjanitorapp import __version__, setup_gettext
-from computerjanitorapp.gtk.areyousure import AreYouSure
+from computerjanitorapp.gtk.dialogs import AreYouSure, CleanupProblem
 from computerjanitorapp.gtk.store import (
     ListStoreColumns, Store, optimize, unused)
 from computerjanitorapp.utilities import format_size
@@ -505,9 +506,15 @@
         # Make various ui elements insensitive.
         self.desensitize()
         cleanable = [cruft for cruft, ispkg in self.get_cleanable_cruft()]
-        # XXX 2010-03-08 barry: Do better than this.
         def error(exception):
-            print exception
+            # XXX 2010-05-19 barry: This will (almost?) always be caused by
+            # some other package manager already running, so if we get that
+            # exception, display a (hopefully) useful dialog.  I'm not sure
+            # it's very helpful to display the low-level apt exception in a
+            # dialog.  `exception` will always be a DBusException; we won't
+            # get the more useful PackageCleanupError.
+            print >> sys.stderr, exception
+            CleanupProblem(self).run()
             self.working = False
         def reply():
             pass

=== modified file 'computerjanitord/collector.py'
--- computerjanitord/collector.py	2010-03-16 14:43:33 +0000
+++ computerjanitord/collector.py	2010-05-20 13:55:46 +0000
@@ -27,7 +27,7 @@
 import logging
 
 from computerjanitor import PluginManager
-from computerjanitord.errors import DuplicateCruftError
+from computerjanitord.errors import DuplicateCruftError, PackageCleanupError
 from computerjanitord.whitelist import Whitelist
 
 
@@ -147,6 +147,14 @@
             else:
                 try:
                     plugin.post_cleanup()
+                except SystemError as error:
+                    # apt will raise a SystemError if some other package
+                    # manager is already running.  Turn this into a dbus
+                    # derived exception so the client will be properly
+                    # informed.
+                    log.exception(
+                        'plugin.post_cleanup(): {0}'.format(plugin))
+                    raise PackageCleanupError(str(error))
                 except:
                     log.exception(
                         'plugin.post_cleanup(): {0}'.format(plugin))

=== modified file 'computerjanitord/errors.py'
--- computerjanitord/errors.py	2010-03-30 19:20:11 +0000
+++ computerjanitord/errors.py	2010-05-20 13:55:46 +0000
@@ -32,11 +32,15 @@
 import computerjanitor
 
 
-class PermissionDeniedError(dbus.DBusException):
-    """Permission denied by policy"""
-
-
-class CruftError(dbus.DBusException):
+class DBusServiceBaseException(computerjanitor.Exception, dbus.DBusException):
+    """Base class exception for the Computer Janitor DBus service."""
+
+
+class PermissionDeniedError(DBusServiceBaseException):
+    """Permission denied by policy."""
+
+
+class CruftError(DBusServiceBaseException):
     """Cruft exceptions passed back to dbus client."""
 
     _errmsg = None
@@ -60,7 +64,7 @@
     _errmsg = 'No such cruft: {0.cruft_name}'
 
 
-class LandmarkPackageError(computerjanitor.Exception):
+class LandmarkPackageError(DBusServiceBaseException):
     """Base class for problems with the landmark packages."""
 
     _errmsg = None
@@ -83,3 +87,9 @@
     """A landmark package is not downloadable."""
 
     _errmsg = 'Landmark package {0.package} is not downloadable'
+
+
+class PackageCleanupError(DBusServiceBaseException):
+    """Could not complete plugin post-cleanup."""
+
+    _errmsg = 'Post-cleanup exception'

=== modified file 'computerjanitord/tests/test_collector.py'
--- computerjanitord/tests/test_collector.py	2010-02-06 01:58:07 +0000
+++ computerjanitord/tests/test_collector.py	2010-05-20 13:55:46 +0000
@@ -24,15 +24,23 @@
 
 import os
 import shutil
+import apt_pkg
 import tempfile
 import unittest
+import pkg_resources
+import multiprocessing
 
 from computerjanitor.plugin import Plugin
 from computerjanitord.collector import Collector
-from computerjanitord.errors import DuplicateCruftError
+from computerjanitord.errors import DuplicateCruftError, PackageCleanupError
 from computerjanitord.tests.test_application import ApplicationTestSetupMixin
 
 
+LOCK_FILE = pkg_resources.resource_filename(
+    'computerjanitord.tests',
+    os.path.join('data', 'var', 'lib', 'dpkg', 'status'))
+
+
 class MockCruft:
     """Mock cruft that supports the required `get_name()` interface."""
 
@@ -66,10 +74,23 @@
         return []
 
 
+class LockingPlugin(Plugin):
+    """All this plugin does is acquire a fake apt lock after cleanup."""
+
+    def get_cruft(self):
+        return []
+
+    def post_cleanup(self):
+        # If the lock cannot be acquired, an exception is raised.
+        with apt_pkg.FileLock(LOCK_FILE):
+            # Do something.
+            pass
+
+
 class MockPluginManager:
     def __init__(self, app, plugin_dirs):
+        # Ignore plugin_dirs
         self.app = app
-        # Ignore plugin_dirs
 
     def get_plugins(self):
         shortnames = ('one', 'two', 'three')
@@ -77,9 +98,10 @@
             plugin = MockPlugin(prefix, shortnames)
             plugin.set_application(self.app)
             yield plugin
-        plugin = SawAppPlugin()
-        plugin.set_application(self.app)
-        yield plugin
+        for plugin_class in (SawAppPlugin, LockingPlugin):
+            plugin = plugin_class()
+            plugin.set_application(self.app)
+            yield plugin
 
 
 class MockCruftExtra(MockCruft):
@@ -149,6 +171,22 @@
         cruft_names = set(cruft.get_name() for cruft in self.collector.cruft)
         self.assertEqual(cruft_keys, cruft_names)
 
+    def test_cleanup_lock(self):
+        # Pretend we're running synaptic at the same time.  We have to acquire
+        # this fake-synaptic lock in a subprocess.
+        lock_event = multiprocessing.Event()
+        continue_event = multiprocessing.Event()
+        class AptLockThread(multiprocessing.Process):
+            def run(self):
+                with apt_pkg.FileLock(LOCK_FILE):
+                    lock_event.set()
+                    continue_event.wait(1.0)
+        apt_locker = AptLockThread()
+        apt_locker.start()
+        lock_event.wait(1.0)
+        self.assertRaises(PackageCleanupError, self.collector.clean, [])
+        continue_event.set()
+
 
 class TestDuplicateCruftCollector(
     unittest.TestCase, ApplicationTestSetupMixin):

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-15 16:13:29 +0000
+++ debian/changelog	2010-05-20 13:55:46 +0000
@@ -1,4 +1,11 @@
-computer-janitor (2.0-0ubuntu6) lucid; urgency=low
+computer-janitor (2.0.1~ppa1) lucid; urgency=low
+
+  * Display dialog in gtk version when another package manager is running,
+    preventing package plugin post-cleanup from completing. (LP: #545306)
+
+ -- Barry Warsaw <[e-mail]>  Thu, 20 May 2010 09:36:15 -0400
+
+computer-janitor (2.0~ppa0) lucid; urgency=low
 
   * Since CJ 2.0 won't make it into Lucid, do Maverick updates now.
     (LP: #552777)

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-04-01 17:33:15 +0000
+++ po/POTFILES.in	2010-05-20 13:55:46 +0000
@@ -1,6 +1,6 @@
 [encoding: UTF-8]
 computerjanitorapp/gtk/main.py
-computerjanitorapp/gtk/areyousure.py
+computerjanitorapp/gtk/dialogs.py
 computerjanitorapp/gtk/ui.py
 computerjanitorapp/gtk/__init__.py
 computerjanitorapp/gtk/store.py

=== modified file 'po/computerjanitor.pot'
--- po/computerjanitor.pot	2010-04-15 16:09:46 +0000
+++ po/computerjanitor.pot	2010-05-20 13:55:46 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-15 12:09-0400\n"
+"POT-Creation-Date: 2010-05-20 09:32-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -20,54 +20,64 @@
 #. that would require a richer interface to the dbus service, and
 #. probably to the cruft plugin architecture underneath that.
 #.
-#: ../computerjanitorapp/gtk/areyousure.py:49
+#: ../computerjanitorapp/gtk/dialogs.py:54
 msgid "Are you sure you want to clean your system?"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:55
-#: ../computerjanitorapp/gtk/areyousure.py:69
+#: ../computerjanitorapp/gtk/dialogs.py:60
+#: ../computerjanitorapp/gtk/dialogs.py:74
 msgid "Clean up"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:62
+#: ../computerjanitorapp/gtk/dialogs.py:67
 msgid "<b>Software packages to remove: {packages}</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:63
+#: ../computerjanitorapp/gtk/dialogs.py:68
 msgid ""
 "\n"
 "Removing packages that are still in use can cause errors."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:66
+#: ../computerjanitorapp/gtk/dialogs.py:71
 msgid "Remove packages"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:68
+#: ../computerjanitorapp/gtk/dialogs.py:73
 msgid "Non-package items to remove: {others}."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:48
+#: ../computerjanitorapp/gtk/dialogs.py:96
+msgid ""
+"System clean up could not complete. Be sure no other package manager such as "
+"Synaptic or Update Manager is running."
+msgstr ""
+
+#: ../computerjanitorapp/gtk/dialogs.py:104
+msgid "System clean up failure"
+msgstr ""
+
+#: ../computerjanitorapp/gtk/ui.py:49
 msgid "Package will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:49
+#: ../computerjanitorapp/gtk/ui.py:50
 msgid "Package will be <b>installed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:50
+#: ../computerjanitorapp/gtk/ui.py:51
 msgid "File will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:264
+#: ../computerjanitorapp/gtk/ui.py:265
 msgid "Size: {bytes}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:346
+#: ../computerjanitorapp/gtk/ui.py:347
 msgid "Processing {cruft}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:469
+#: ../computerjanitorapp/gtk/ui.py:470
 #: ../data/computer-janitor-gtk.desktop.in.h:2
 msgid "Computer Janitor"
 msgstr ""

=== modified file 'po/es.po'
--- po/es.po	2010-04-15 16:09:46 +0000
+++ po/es.po	2010-05-20 13:55:46 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-15 12:09-0400\n"
+"POT-Creation-Date: 2010-05-20 09:32-0400\n"
 "PO-Revision-Date: 2008-10-26 23:38+0100\n"
 "Last-Translator: Ricardo Pérez López <[e-mail]>\n"
 "Language-Team: \n"
@@ -21,56 +21,66 @@
 #. that would require a richer interface to the dbus service, and
 #. probably to the cruft plugin architecture underneath that.
 #.
-#: ../computerjanitorapp/gtk/areyousure.py:49
+#: ../computerjanitorapp/gtk/dialogs.py:54
 msgid "Are you sure you want to clean your system?"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:55
-#: ../computerjanitorapp/gtk/areyousure.py:69
+#: ../computerjanitorapp/gtk/dialogs.py:60
+#: ../computerjanitorapp/gtk/dialogs.py:74
 #, fuzzy
 msgid "Clean up"
 msgstr "_Limpiar"
 
-#: ../computerjanitorapp/gtk/areyousure.py:62
+#: ../computerjanitorapp/gtk/dialogs.py:67
 msgid "<b>Software packages to remove: {packages}</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:63
+#: ../computerjanitorapp/gtk/dialogs.py:68
 msgid ""
 "\n"
 "Removing packages that are still in use can cause errors."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:66
+#: ../computerjanitorapp/gtk/dialogs.py:71
 #, fuzzy
 msgid "Remove packages"
 msgstr "paquete .deb"
 
-#: ../computerjanitorapp/gtk/areyousure.py:68
+#: ../computerjanitorapp/gtk/dialogs.py:73
 msgid "Non-package items to remove: {others}."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:48
+#: ../computerjanitorapp/gtk/dialogs.py:96
+msgid ""
+"System clean up could not complete. Be sure no other package manager such as "
+"Synaptic or Update Manager is running."
+msgstr ""
+
+#: ../computerjanitorapp/gtk/dialogs.py:104
+msgid "System clean up failure"
+msgstr ""
+
+#: ../computerjanitorapp/gtk/ui.py:49
 msgid "Package will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:49
+#: ../computerjanitorapp/gtk/ui.py:50
 msgid "Package will be <b>installed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:50
+#: ../computerjanitorapp/gtk/ui.py:51
 msgid "File will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:264
+#: ../computerjanitorapp/gtk/ui.py:265
 msgid "Size: {bytes}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:346
+#: ../computerjanitorapp/gtk/ui.py:347
 msgid "Processing {cruft}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:469
+#: ../computerjanitorapp/gtk/ui.py:470
 #: ../data/computer-janitor-gtk.desktop.in.h:2
 msgid "Computer Janitor"
 msgstr ""

=== modified file 'po/fi.po'
--- po/fi.po	2010-04-15 16:09:46 +0000
+++ po/fi.po	2010-05-20 13:55:46 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: cruft-remover 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-15 12:09-0400\n"
+"POT-Creation-Date: 2010-05-20 09:32-0400\n"
 "PO-Revision-Date: 2008-10-09 23:02+0300\n"
 "Last-Translator: Lars Wirzenius <[e-mail]>\n"
 "Language-Team: Finnish\n"
@@ -21,56 +21,66 @@
 #. that would require a richer interface to the dbus service, and
 #. probably to the cruft plugin architecture underneath that.
 #.
-#: ../computerjanitorapp/gtk/areyousure.py:49
+#: ../computerjanitorapp/gtk/dialogs.py:54
 msgid "Are you sure you want to clean your system?"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:55
-#: ../computerjanitorapp/gtk/areyousure.py:69
+#: ../computerjanitorapp/gtk/dialogs.py:60
+#: ../computerjanitorapp/gtk/dialogs.py:74
 #, fuzzy
 msgid "Clean up"
 msgstr "_Puhdista"
 
-#: ../computerjanitorapp/gtk/areyousure.py:62
+#: ../computerjanitorapp/gtk/dialogs.py:67
 msgid "<b>Software packages to remove: {packages}</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:63
+#: ../computerjanitorapp/gtk/dialogs.py:68
 msgid ""
 "\n"
 "Removing packages that are still in use can cause errors."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:66
+#: ../computerjanitorapp/gtk/dialogs.py:71
 #, fuzzy
 msgid "Remove packages"
 msgstr ".deb-paketti"
 
-#: ../computerjanitorapp/gtk/areyousure.py:68
+#: ../computerjanitorapp/gtk/dialogs.py:73
 msgid "Non-package items to remove: {others}."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:48
+#: ../computerjanitorapp/gtk/dialogs.py:96
+msgid ""
+"System clean up could not complete. Be sure no other package manager such as "
+"Synaptic or Update Manager is running."
+msgstr ""
+
+#: ../computerjanitorapp/gtk/dialogs.py:104
+msgid "System clean up failure"
+msgstr ""
+
+#: ../computerjanitorapp/gtk/ui.py:49
 msgid "Package will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:49
+#: ../computerjanitorapp/gtk/ui.py:50
 msgid "Package will be <b>installed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:50
+#: ../computerjanitorapp/gtk/ui.py:51
 msgid "File will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:264
+#: ../computerjanitorapp/gtk/ui.py:265
 msgid "Size: {bytes}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:346
+#: ../computerjanitorapp/gtk/ui.py:347
 msgid "Processing {cruft}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:469
+#: ../computerjanitorapp/gtk/ui.py:470
 #: ../data/computer-janitor-gtk.desktop.in.h:2
 msgid "Computer Janitor"
 msgstr ""

=== modified file 'po/fr.po'
--- po/fr.po	2010-04-15 16:09:46 +0000
+++ po/fr.po	2010-05-20 13:55:46 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: cruft-remover 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-15 12:09-0400\n"
+"POT-Creation-Date: 2010-05-20 09:32-0400\n"
 "PO-Revision-Date: 2008-10-26 23:02+0300\n"
 "Last-Translator: Jonathan Ernst <[e-mail]>\n"
 "Language-Team: French\n"
@@ -21,56 +21,66 @@
 #. that would require a richer interface to the dbus service, and
 #. probably to the cruft plugin architecture underneath that.
 #.
-#: ../computerjanitorapp/gtk/areyousure.py:49
+#: ../computerjanitorapp/gtk/dialogs.py:54
 msgid "Are you sure you want to clean your system?"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:55
-#: ../computerjanitorapp/gtk/areyousure.py:69
+#: ../computerjanitorapp/gtk/dialogs.py:60
+#: ../computerjanitorapp/gtk/dialogs.py:74
 #, fuzzy
 msgid "Clean up"
 msgstr "_Nettoyer"
 
-#: ../computerjanitorapp/gtk/areyousure.py:62
+#: ../computerjanitorapp/gtk/dialogs.py:67
 msgid "<b>Software packages to remove: {packages}</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:63
+#: ../computerjanitorapp/gtk/dialogs.py:68
 msgid ""
 "\n"
 "Removing packages that are still in use can cause errors."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:66
+#: ../computerjanitorapp/gtk/dialogs.py:71
 #, fuzzy
 msgid "Remove packages"
 msgstr "paquet .deb"
 
-#: ../computerjanitorapp/gtk/areyousure.py:68
+#: ../computerjanitorapp/gtk/dialogs.py:73
 msgid "Non-package items to remove: {others}."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:48
+#: ../computerjanitorapp/gtk/dialogs.py:96
+msgid ""
+"System clean up could not complete. Be sure no other package manager such as "
+"Synaptic or Update Manager is running."
+msgstr ""
+
+#: ../computerjanitorapp/gtk/dialogs.py:104
+msgid "System clean up failure"
+msgstr ""
+
+#: ../computerjanitorapp/gtk/ui.py:49
 msgid "Package will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:49
+#: ../computerjanitorapp/gtk/ui.py:50
 msgid "Package will be <b>installed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:50
+#: ../computerjanitorapp/gtk/ui.py:51
 msgid "File will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:264
+#: ../computerjanitorapp/gtk/ui.py:265
 msgid "Size: {bytes}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:346
+#: ../computerjanitorapp/gtk/ui.py:347
 msgid "Processing {cruft}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:469
+#: ../computerjanitorapp/gtk/ui.py:470
 #: ../data/computer-janitor-gtk.desktop.in.h:2
 msgid "Computer Janitor"
 msgstr ""

=== modified file 'po/ja.po'
--- po/ja.po	2010-04-15 16:09:46 +0000
+++ po/ja.po	2010-05-20 13:55:46 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: cruft-remover 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-15 12:09-0400\n"
+"POT-Creation-Date: 2010-05-20 09:32-0400\n"
 "PO-Revision-Date: 2008-10-25 00:08+0900\n"
 "Last-Translator: Mitsuya Shibata <[e-mail]>\n"
 "Language-Team: Ubuntu Japanese Team <[e-mail]>\n"
@@ -20,56 +20,66 @@
 #. that would require a richer interface to the dbus service, and
 #. probably to the cruft plugin architecture underneath that.
 #.
-#: ../computerjanitorapp/gtk/areyousure.py:49
+#: ../computerjanitorapp/gtk/dialogs.py:54
 msgid "Are you sure you want to clean your system?"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:55
-#: ../computerjanitorapp/gtk/areyousure.py:69
+#: ../computerjanitorapp/gtk/dialogs.py:60
+#: ../computerjanitorapp/gtk/dialogs.py:74
 #, fuzzy
 msgid "Clean up"
 msgstr "整頓する(_C)"
 
-#: ../computerjanitorapp/gtk/areyousure.py:62
+#: ../computerjanitorapp/gtk/dialogs.py:67
 msgid "<b>Software packages to remove: {packages}</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:63
+#: ../computerjanitorapp/gtk/dialogs.py:68
 msgid ""
 "\n"
 "Removing packages that are still in use can cause errors."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:66
+#: ../computerjanitorapp/gtk/dialogs.py:71
 #, fuzzy
 msgid "Remove packages"
 msgstr "deb パッケージ"
 
-#: ../computerjanitorapp/gtk/areyousure.py:68
+#: ../computerjanitorapp/gtk/dialogs.py:73
 msgid "Non-package items to remove: {others}."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:48
+#: ../computerjanitorapp/gtk/dialogs.py:96
+msgid ""
+"System clean up could not complete. Be sure no other package manager such as "
+"Synaptic or Update Manager is running."
+msgstr ""
+
+#: ../computerjanitorapp/gtk/dialogs.py:104
+msgid "System clean up failure"
+msgstr ""
+
+#: ../computerjanitorapp/gtk/ui.py:49
 msgid "Package will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:49
+#: ../computerjanitorapp/gtk/ui.py:50
 msgid "Package will be <b>installed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:50
+#: ../computerjanitorapp/gtk/ui.py:51
 msgid "File will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:264
+#: ../computerjanitorapp/gtk/ui.py:265
 msgid "Size: {bytes}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:346
+#: ../computerjanitorapp/gtk/ui.py:347
 msgid "Processing {cruft}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:469
+#: ../computerjanitorapp/gtk/ui.py:470
 #: ../data/computer-janitor-gtk.desktop.in.h:2
 msgid "Computer Janitor"
 msgstr ""

=== modified file 'po/pl.po'
--- po/pl.po	2010-04-15 16:09:46 +0000
+++ po/pl.po	2010-05-20 13:55:46 +0000
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: Cruft Remover\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-15 12:09-0400\n"
+"POT-Creation-Date: 2010-05-20 09:32-0400\n"
 "PO-Revision-Date: 2008-10-28 10:35+0100\n"
 "Last-Translator: Piotr Makowski <[e-mail]>\n"
 "Language-Team: Piotr Makowski (Aviary.pl) <[e-mail]>\n"
@@ -20,56 +20,66 @@
 #. that would require a richer interface to the dbus service, and
 #. probably to the cruft plugin architecture underneath that.
 #.
-#: ../computerjanitorapp/gtk/areyousure.py:49
+#: ../computerjanitorapp/gtk/dialogs.py:54
 msgid "Are you sure you want to clean your system?"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:55
-#: ../computerjanitorapp/gtk/areyousure.py:69
+#: ../computerjanitorapp/gtk/dialogs.py:60
+#: ../computerjanitorapp/gtk/dialogs.py:74
 #, fuzzy
 msgid "Clean up"
 msgstr "_Wyczyść"
 
-#: ../computerjanitorapp/gtk/areyousure.py:62
+#: ../computerjanitorapp/gtk/dialogs.py:67
 msgid "<b>Software packages to remove: {packages}</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:63
+#: ../computerjanitorapp/gtk/dialogs.py:68
 msgid ""
 "\n"
 "Removing packages that are still in use can cause errors."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/areyousure.py:66
+#: ../computerjanitorapp/gtk/dialogs.py:71
 #, fuzzy
 msgid "Remove packages"
 msgstr "pakiet .deb"
 
-#: ../computerjanitorapp/gtk/areyousure.py:68
+#: ../computerjanitorapp/gtk/dialogs.py:73
 msgid "Non-package items to remove: {others}."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:48
+#: ../computerjanitorapp/gtk/dialogs.py:96
+msgid ""
+"System clean up could not complete. Be sure no other package manager such as "
+"Synaptic or Update Manager is running."
+msgstr ""
+
+#: ../computerjanitorapp/gtk/dialogs.py:104
+msgid "System clean up failure"
+msgstr ""
+
+#: ../computerjanitorapp/gtk/ui.py:49
 msgid "Package will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:49
+#: ../computerjanitorapp/gtk/ui.py:50
 msgid "Package will be <b>installed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:50
+#: ../computerjanitorapp/gtk/ui.py:51
 msgid "File will be <b>removed</b>."
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:264
+#: ../computerjanitorapp/gtk/ui.py:265
 msgid "Size: {bytes}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:346
+#: ../computerjanitorapp/gtk/ui.py:347
 msgid "Processing {cruft}"
 msgstr ""
 
-#: ../computerjanitorapp/gtk/ui.py:469
+#: ../computerjanitorapp/gtk/ui.py:470
 #: ../data/computer-janitor-gtk.desktop.in.h:2
 msgid "Computer Janitor"
 msgstr ""

=== modified file 'setup.py'
--- setup.py	2010-03-18 13:19:32 +0000
+++ setup.py	2010-05-20 13:55:46 +0000
@@ -31,7 +31,7 @@
 
 
 setup(name='computer-janitor',
-      version="2.0",
+      version="2.0.1",
       description="Clean up a system so it's more like a freshly "
                   "installed one",
       author='Computer Janitor Hackers',