* don't hide the details for the security upgrades yet

3 files changed, 18 insertions, 10 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 99ec292f..1c6963a0 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -299,11 +299,16 @@ class SoftwareProperties(SimpleGladeApp):
     """Render a nice output to show the source in a treeview"""
     (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source)
 
+    # FIXME: add this back when it's more consistent
+    #if special in (aptsources.SOURCE_UPDATES,
+    #               aptsources.SOURCE_BACKPORTS,
+    #               aptsources.SOURCE_SECURITY):
+    #  contents = "<b>%s</b>" % nice_dist
+    #elif special == aptsources.SOURCE_SYSTEM:
     if special in (aptsources.SOURCE_UPDATES,
-                   aptsources.SOURCE_BACKPORTS,
-                   aptsources.SOURCE_SECURITY):
-      contents = "<b>%s</b>" % nice_dist
-    elif special == aptsources.SOURCE_SYSTEM:
+                aptsources.SOURCE_BACKPORTS,
+                aptsources.SOURCE_SECURITY,
+                aptsources.SOURCE_SYSTEM):
       contents = "<b>%s</b>" % nice_dist
       if source.type in ("deb-src", "rpm-src"):
         contents += " (%s)" % nice_type
@@ -319,9 +324,10 @@ class SoftwareProperties(SimpleGladeApp):
 
   def reload_sourceslist(self):
     self.source_store.clear()
-    if self.sourceslist.check_for_endangered_dists():
-      self.button_revert.set_sensitive(True)
-      self.save_sourceslist()
+    # FIXME: this happens with way too much magic, we need to either
+    #        ask the user or provide a different way to present this
+    #        )maybe some sort of configuration is enough?)
+    self.sourceslist.check_for_endangered_dists()
     for source in self.sourceslist.list:
       if source.invalid:
         continue
diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py
index 0546ef0a..820e6e77 100644
--- a/SoftwareProperties/aptsources.py
+++ b/SoftwareProperties/aptsources.py
@@ -362,7 +362,7 @@ class SourcesList:
     self.matcher = SourceEntryMatcher()
 
     for source in self.list:
-      if source.invalid:
+      if source.invalid or source.type != "deb":
         continue
       (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source)
       #print "match: %s %s" % (source.dist, special)
@@ -406,7 +406,7 @@ class SourcesList:
         comps_sec = set(source.comps)
         # Are there components without updates?
         comps_endangered = comps_sys - comps_sec
-        #print "In Danger: %s " % comps_endangered
+        #print "In Danger: %s - %s = %s " % (comps_sys, comps_sec, comps_endangered)
         if len(comps_endangered) > 0:
           # convert the set into a list
           comps_write=""
diff --git a/debian/changelog b/debian/changelog
index 50eb7a1c..e5c87e50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 update-manager (0.42.2ubuntu6) dapper; urgency=low
 
-  * SoftwareProperties/*: fix some UI problems (thanks to Sebastian Heinlein)
+  * SoftwareProperties/: 
+    - fix some UI problems (thanks to Sebastian Heinlein)
+    - add breezy-updates, breezy-security to the Add dialog
   * po/pt_BR.po: updated translation 
     (thanks to Carlos Eduardo Pedroza Santiviago)
   * po/pt.po: updated Portugise translation (thanks to Rui Azevedo)