← Back to branch summary

~ubuntu-branches/ubuntu/wily/sessioninstaller/wily-proposed

« back to all changes in this revision

Viewing changes to .pc/02_no_crash_on_install_provides.patch/sessioninstaller/core.py

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2012-08-21 08:50:56 UTC
  • mfrom: (1.1.9)
  • Revision ID: package-import@ubuntu.com-20120821085056-y14a277r80llr45f
Tags: 0.20+bzr131-0ubuntu1
https://launchpad.net/bugs/790500
https://launchpad.net/bugs/1028640
* debian/control: Update Vcs-* to Quantal branch.
* New upstream snapshot:
  - Fix typo in error message. (LP: #790500)
  - Make sure not to accidentally call defer.callback() twice (LP #848605)
  - Work around static vs. GI gobject binding crash. (LP: #1028640)
* Drop fix-defer-callback.patch, included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/02_no_crash_on_install_provides.patch/sessioninstaller/core.py
46
46
from gi.repository import GObject
47
47
from gi.repository import Gtk
48
48
from gi.repository import Pango
49
 
import gst
50
49
from xdg.DesktopEntry import DesktopEntry
51
50
 
52
51
import utils
60
59
else:
61
60
    from backends.dummy import DummyBackend as Backend
62
61
 
 
62
# WARNING: This pulls in the static gobject bindings which collide with the GI
 
63
# ones!
 
64
import gst
 
65
 
63
66
gettext.textdomain("sessioninstaller")
64
67
gettext.bindtextdomain("sessioninstaller")
65
68
 
768
771
                header = _("Catalog could not be read")
769
772
                #TRANSLATORS: %s is a file path
770
773
                message = _("The file '%s' isn't a valid software catalog. "
771
 
                            "Please redownload or contanct the "
 
774
                            "Please redownload or contact the "
772
775
                            "provider.") % catalog_file
773
776
                self._show_error(header, message)
774
777
                raise errors.ModifyFailed(message)