Merge lp:~gilir/sessioninstaller/defer-migration into lp:sessioninstaller

[Julien Lavergne]

[lp:~gilir/sessioninstaller/defer-migration]

119. By Julien Lavergne on 2011-01-16

Fix typo in sessioninstaller/gstinstaller.py

[Michael Vogt (mvo)]

Thanks! Looks fine.

review: Approve

=== modified file 'sessioninstaller/backends/aptd.py'
--- sessioninstaller/backends/aptd.py	2010-07-03 07:13:26 +0000
+++ sessioninstaller/backends/aptd.py	2011-01-16 11:59:09 +0000
@@ -25,8 +25,8 @@
 
 import gtk
 
-from aptdaemon import defer, \
-                      enums
+from aptdaemon import enums
+import defer
 import aptdaemon.client
 import aptdaemon.errors
 import aptdaemon.gtkwidgets

=== modified file 'sessioninstaller/backends/synaptic.py'
--- sessioninstaller/backends/synaptic.py	2010-05-01 09:00:38 +0000
+++ sessioninstaller/backends/synaptic.py	2011-01-16 11:59:09 +0000
@@ -28,7 +28,7 @@
 
 import gobject
 
-from aptdaemon.defer import Deferred
+from defer import Deferred
 
 import sessioninstaller.errors
 

=== modified file 'sessioninstaller/gstinstaller.py'
--- sessioninstaller/gstinstaller.py	2010-05-01 07:39:08 +0000
+++ sessioninstaller/gstinstaller.py	2011-01-16 11:59:09 +0000
@@ -105,7 +105,7 @@
     except Exception, error:
         log.error(error.message)
         sys.exit(2)
-    log.info(_("Finsihed succesfully"))
+    log.info(_("Finished succesfully"))
     sys.exit(0)
 
 if __name__ == "__main__":