← Back to branch summary

~ubuntu-core-dev/update-manager/main

« back to all changes in this revision

Viewing changes to SoftwareProperties/SoftwareProperties.py

  • Committer: Michael Vogt
  • Date: 2006-10-05 14:36:09 UTC
  • mfrom: (358.1.118 main)
  • mto: This revision was merged to the branch mainline in revision 376.
  • Revision ID: michael.vogt@ubuntu.com-20061005143609-d3d486671aba63d3
* merged from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
SoftwareProperties/SoftwareProperties.py
33
33
import os
34
34
import string
35
35
import re
36
 
 
37
 
#sys.path.append("@prefix/share/update-manager/python")
 
36
from xml.sax.saxutils import escape
38
37
 
39
38
from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp
40
39
from UpdateManager.Common.HelpViewer import HelpViewer
46
45
from dialog_apt_key import apt_key
47
46
from utils import *
48
47
 
 
48
 
49
49
(LIST_MARKUP, LIST_ENABLED, LIST_ENTRY_OBJ) = range(3)
50
50
 
51
51
CONF_MAP = {
482
482
        for source in self.distro.child_sources:
483
483
            if source.template == template:
484
484
                self.sourceslist.remove(source)
 
485
        for source in self.distro.source_code_sources:
 
486
            if source.template == template:
 
487
                self.sourceslist.remove(source)
485
488
    else:
486
489
        self.distro.add_source(self.sourceslist,
487
490
                                     uri=template.base_uri,
698
701
 
699
702
    if source.template == None:
700
703
        if source.comment:
701
 
            contents = "<b>%s</b>" % source.comment
 
704
            contents = "<b>%s</b>" % escape(source.comment)
702
705
            # Only show the components if there are more than one
703
706
            if len(source.comps) > 1:
704
707
                for c in source.comps:
1033
1036
                                 type=gtk.MESSAGE_ERROR,
1034
1037
                                 buttons=gtk.BUTTONS_OK,
1035
1038
                                 message_format=None)
1036
 
      dialog.set_markup(_("<big><b>Error scaning the CD</b></big>\n\n%s"%msg))
 
1039
      dialog.set_markup(_("<big><b>Error scanning the CD</b></big>\n\n%s"%msg))
1037
1040
      res = dialog.run()
1038
1041
      dialog.destroy()
1039
1042
      return