~ubuntu-branches/ubuntu/maverick/software-properties/maverick

« back to all changes in this revision

Viewing changes to softwareproperties/SoftwareProperties.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt, Michael Vogt, Harald Sitter
  • Date: 2010-03-26 13:51:20 UTC
  • Revision ID: james.westby@ubuntu.com-20100326135120-73l6lza9334am9la
Tags: 0.75.8
[ Michael Vogt ]
* softwareproperties/gtk/SoftwarePropertiesGtk.py:
  - do not crash if tranient parent can not be set (LP: #83914)
* debian/manpages/software-properties-gtk.1:
  - add man-page (thanks to Gabe Gorelick) LP: #290308
* add-apt-repository:
  - better help output (LP: #407779)
  - do not crash if setlocale fails (LP: #467369)
* software-properties-gtk:
  - ensure newly created ppa files are readalbe (LP: #497778)
* data/software-properties-gtk.desktop.in:
  - fix desktop file location (thanks to Ricardo Pérez López)
    LP: #543637
* provide apt-add-repository link (LP: #547194)
* debian/manpages/add-apt-repository.1:
  - add man-page, thanks to Chow Loong Jin (LP: #407779)
* fix lintian warnings
* softwareproperties/SoftwareProperties.py:
  - show summary in addition to comment for disabled entries 
    (LP: #543207)

[ Harald Sitter ]
* [KDE] Fix bug in I18nHelper, where it would trigger a crash if unicode()
  to UTF-8 fails. Fallback to latin1 in this case. This for example happens
  when the APT keyring contains a key with non-latin characters, which can
  happen with PPA keys, since those contain the owner's name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
433
433
    """Render a nice output to show the source in a treeview"""
434
434
    if source.template == None:
435
435
        if source.comment:
436
 
            contents = "<b>%s</b>" % escape(source.comment)
 
436
            contents = "<b>%s</b> (%s %s" % (escape(source.comment),
 
437
                                              source.uri, source.dist)
437
438
            # Only show the components if there are more than one
438
439
            if len(source.comps) > 1:
439
440
                for c in source.comps:
440
441
                    contents += " %s" % c
 
442
            contents += ")"
441
443
        else:
442
444
            contents = "<b>%s %s</b>" % (source.uri, source.dist)
443
445
            for c in source.comps: